diff --git a/src/templates/users/settings/_sidebar.pug b/src/templates/users/settings/_sidebar.pug
deleted file mode 100644
index 8a025ae..0000000
--- a/src/templates/users/settings/_sidebar.pug
+++ /dev/null
@@ -1,20 +0,0 @@
-#settings-sidebar
-	.settings-header
-		.settings-title Settings
-	.settings-content
-		ul
-			a(class="{% if title == 'profile' %}active{% endif %}",
-				href="{{ url_for('settings.profile') }}")
-				li
-					i.pi-vcard
-					| Profile
-			a(class="{% if title == 'emails' %}active{% endif %}",
-					href="{{ url_for('settings.emails') }}")
-				li
-					i.pi-email
-					| Emails
-			a(class="{% if title == 'billing' %}active{% endif %}",
-					href="{{ url_for('settings.billing') }}")
-				li
-					i.pi-credit-card
-					| Subscription
diff --git a/src/templates/users/settings/billing.pug b/src/templates/users/settings/billing.pug
index 7217272..634d43f 100644
--- a/src/templates/users/settings/billing.pug
+++ b/src/templates/users/settings/billing.pug
@@ -1,62 +1,58 @@
-| {% extends 'layout.html' %}
+| {% extends 'users/settings/page.html' %}
 | {% block head %}
+| {{ super() }}
 style(type='text/css').
 	button#recheck_subscription {
 		margin-top: 1em;
 	}
 | {% endblock %}
-| {% block body %}
+
+| {% block settings_page_title %}Subscription{% endblock %}
+| {% block settings_page_content %}
 | {% set renew_url = url_for('cloud.renew_subscription') %}
-.container
-	#settings
-		| {% include 'users/settings/_sidebar.html'%}
-		#settings-container
-			.settings-header
-				.settings-title Subscription
+| {% if current_user.has_cap('can-renew-subscription') %}
+| {% if current_user.has_cap('subscriber') %}
+h3.subscription-active
+	i.pi-check
+	|  Your subscription is active
+h4 Thank you for supporting us!
+hr
+p Subscription expires on: <strong>{{ expiration_date }}</strong>
+| {% else %}
+h3.subscription-missing
+	i.pi-info
+	a(href="{{renew_url}}") Your subscription can be renewed
+hr
+p.text-danger Subscription expired on: <strong>{{ expiration_date }}</strong>
+p
+	a.btn.btn-success(href="{{renew_url}}") Renew now
+| {% endif %}
 
-			.settings-content
-				| {% if current_user.has_cap('can-renew-subscription') %}
-				| {% if current_user.has_cap('subscriber') %}
-				h3.subscription-active
-					i.pi-check
-					|  Your subscription is active
-				h4 Thank you for supporting us!
-				hr
-				p Subscription expires on: <strong>{{ expiration_date }}</strong>
-				| {% else %}
-				h3.subscription-missing
-					i.pi-info
-					a(href="{{renew_url}}") Your subscription can be renewed
-				hr
-				p.text-danger Subscription expired on: <strong>{{ expiration_date }}</strong>
-				p
-					a.btn.btn-success(href="{{renew_url}}") Renew now
-				| {% endif %}
+p
+	a(href="{{ config['EXTERNAL_SUBSCRIPTIONS_MANAGEMENT_SERVER'] | urljoin('my-account/subscriptions/') }}") Manage your subscription on Blender Store
 
-				p
-					a(href="{{ config['EXTERNAL_SUBSCRIPTIONS_MANAGEMENT_SERVER'] | urljoin('my-account/subscriptions/') }}") Manage your subscription on Blender Store
+| {% elif 'demo' in groups %}
+h3.subscription-demo
+	i.pi-heart-filled
+	| You have a free account
 
-				| {% elif 'demo' in groups %}
-				h3.subscription-demo
-					i.pi-heart-filled
-					| You have a free account
+hr
 
-				hr
+p You have full access to the Blender Cloud, provided by the Blender Institute. This account is meant for free evaluation of the service. Get in touch with #[a(href="mailto:cloudsupport@blender.org") cloudsupport@blender.org] if you have any questions.
 
-				p You have full access to the Blender Cloud, provided by the Blender Institute. This account is meant for free evaluation of the service. Get in touch with #[a(href="mailto:cloudsupport@blender.org") cloudsupport@blender.org] if you have any questions.
+| {% else %}
+h3.subscription-missing
+	i.pi-info
+	| You do not have an active subscription.
+h3
+	a(href="https://store.blender.org/product/membership/") Get full access to Blender Cloud now!
+| {% endif %}
 
-				| {% else %}
-				h3.subscription-missing
-					i.pi-info
-					| You do not have an active subscription.
-				h3
-					a(href="https://store.blender.org/product/membership/") Get full access to Blender Cloud now!
-				| {% endif %}
-
-				hr
-				p
-					button#recheck_subscription.btn.btn-default(onclick="javascript:recheck_subscription(this)") Re-check my subscription
+hr
+p
+	button#recheck_subscription.btn.btn-default(onclick="javascript:recheck_subscription(this)") Re-check my subscription
 
+hr
 
 script.
 	function recheck_subscription(button) {
diff --git a/src/templates/users/settings/emails.pug b/src/templates/users/settings/emails.pug
index 9c8e6e9..2411997 100644
--- a/src/templates/users/settings/emails.pug
+++ b/src/templates/users/settings/emails.pug
@@ -1,27 +1,17 @@
-| {% extends 'layout.html' %}
-| {% block body %}
-.container
-	#settings
-		| {% include 'users/settings/_sidebar.html'%}
-		#settings-container
-			.settings-header
-				.settings-title Emails
-
-			.settings-content
-
-				.settings-form
-					form#settings-form(method='POST', action="{{url_for('settings.emails')}}")
-						| {{ form.csrf_token }}
-						| {% for subfield in form.email_communications %}
-						.form-group.
-							{{ subfield }}
-							{{ subfield.label }}
-						| {% endfor %}
-
-						.buttons
-							button.btn.btn-default.button-submit(type='submit')
-								i.pi-check
-								| Save Changes
-
+| {% extends 'users/settings/page.html' %}
+| {% block settings_page_title %}Emails{% endblock %}
+| {% block settings_page_content %}
+.settings-form
+	form#settings-form(method='POST', action="{{url_for('settings.emails')}}")
+		| {{ form.csrf_token }}
+		| {% for subfield in form.email_communications %}
+		.form-group.
+			{{ subfield }}
+			{{ subfield.label }}
+		| {% endfor %}
 
+		.buttons
+			button.btn.btn-default.button-submit(type='submit')
+				i.pi-check
+				| Save Changes
 | {% endblock %}
diff --git a/src/templates/users/settings/page.pug b/src/templates/users/settings/page.pug
new file mode 100644
index 0000000..03d2332
--- /dev/null
+++ b/src/templates/users/settings/page.pug
@@ -0,0 +1,14 @@
+| {% extends 'users/settings/base.html' %}
+| {% block settings_sidebar_menu %}
+| {{ super() }}
+a(class="{% if title == 'emails' %}active{% endif %}",
+        href="{{ url_for('settings.emails') }}")
+    li
+        i.pi-email
+        | Emails
+a(class="{% if title == 'billing' %}active{% endif %}",
+        href="{{ url_for('settings.billing') }}")
+    li
+        i.pi-credit-card
+        | Subscription
+| {% endblock %}