diff --git a/passbook/core/templates/base/skeleton.html b/passbook/core/templates/base/skeleton.html
index d4105aec12..ddd6078555 100644
--- a/passbook/core/templates/base/skeleton.html
+++ b/passbook/core/templates/base/skeleton.html
@@ -8,7 +8,7 @@
     <head>
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-        <title>{% block title %}{% trans title %}{% endblock %}</title>
+        <title>{% block title %}{% trans title|default:"passbook" %}{% endblock %}</title>
         <link rel="icon" type="image/png" href="{% static 'passbook/logo.png' %}">
         <link rel="shortcut icon" type="image/png" href="{% static 'passbook/logo.png' %}">
         <link rel="stylesheet" type="text/css" href="{% static 'node_modules/@patternfly/patternfly/patternfly.css' %}">
diff --git a/passbook/core/templates/overview/base.html b/passbook/core/templates/overview/base.html
index 22ef69a13e..205ee5a565 100644
--- a/passbook/core/templates/overview/base.html
+++ b/passbook/core/templates/overview/base.html
@@ -7,7 +7,6 @@
 {% load utils %}
 
 {% block page_content %}
-{% include 'partials/messages.html' %}
 <main role="main" class="pf-c-page__main" tabindex="-1" id="main-content">
     {% block content %}
     {% endblock %}
diff --git a/passbook/core/templates/user/base.html b/passbook/core/templates/user/base.html
index b434da056b..6e9d0e650e 100644
--- a/passbook/core/templates/user/base.html
+++ b/passbook/core/templates/user/base.html
@@ -1,67 +1,69 @@
-{% extends "overview/base.html" %}
+{% extends "base/page.html" %}
 
 {% load i18n %}
 {% load is_active %}
 {% load static %}
 {% load passbook_user_settings %}
 
-{% block content %}
-<section class="pf-c-page__main-section">
-    <div class="pf-l-split pf-m-gutter">
-        <div class="pf-l-split__item">
-            <div class="pf-c-card">
-                <div class="pf-c-card__body">
-                    <nav class="pf-c-nav" aria-label="Global">
-                        <section class="pf-c-nav__section">
-                            <h2 class="pf-c-nav__section-title">{% trans 'General Settings' %}</h2>
-                            <ul class="pf-c-nav__list">
-                                <li class="pf-c-nav__item">
-                                    <a href="{% url 'passbook_core:user-settings' %}" class="pf-c-nav__link {% is_active 'passbook_core:user-settings' %}">{% trans 'User Details' %}</a>
-                                </li>
-                            </ul>
-                        </section>
-                        {% user_factors as user_factors_loc %}
-                        {% if user_factors_loc %}
-                        <section class="pf-c-nav__section">
-                            <h2 class="pf-c-nav__section-title">{% trans 'Factors' %}</h2>
-                            <ul class="pf-c-nav__list">
-                                {% for factor in user_factors_loc %}
-                                <li class="pf-c-nav__item">
-                                    <a href="{% url factor.view_name %}" class="pf-c-nav__link {% is_active factor.view_name %}">
-                                        <i class="{{ factor.icon }}"></i>
-                                    {{ factor.name }}
-                                    </a>
-                                </li>
-                                {% endfor %}
-                            </ul>
-                        </section>
-                        {% endif %}
-                        {% user_sources as user_sources_loc %}
-                        {% if user_sources_loc %}
-                        <section class="pf-c-nav__section">
-                            <h2 class="pf-c-nav__section-title">{% trans 'Sources' %}</h2>
-                            <ul class="pf-c-nav__list">
-                                {% for source in user_sources_loc %}
-                                <li class="pf-c-nav__item">
-                                    <a href="{{ source.view_name }}" class="pf-c-nav__link {% if user_settings.view_name == request.get_full_path %} pf-m-current {% endif %}">
-                                        <i class="{{ source.icon }}"></i>
-                                    {{ source.name }}
-                                    </a>
-                                </li>
-                                {% endfor %}
-                            </ul>
-                        </section>
-                        {% endif %}
-                    </nav>
+{% block page_content %}
+<div class="pf-c-page__sidebar">
+    <div class="pf-c-page__sidebar-body">
+        <nav class="pf-c-nav" id="page-default-nav-example-primary-nav" aria-label="Global">
+            <section class="pf-c-nav__section">
+                <h2 class="pf-c-nav__section-title">{% trans 'General Settings' %}</h2>
+                <ul class="pf-c-nav__list">
+                    <li class="pf-c-nav__item">
+                        <a href="{% url 'passbook_core:user-settings' %}"
+                            class="pf-c-nav__link {% is_active 'passbook_core:user-settings' %}">{% trans 'User Details' %}</a>
+                    </li>
+                </ul>
+            </section>
+            {% user_factors as user_factors_loc %}
+            {% if user_factors_loc %}
+            <section class="pf-c-nav__section">
+                <h2 class="pf-c-nav__section-title">{% trans 'Factors' %}</h2>
+                <ul class="pf-c-nav__list">
+                    {% for factor in user_factors_loc %}
+                    <li class="pf-c-nav__item">
+                        <a href="{% url factor.view_name %}" class="pf-c-nav__link {% is_active factor.view_name %}">
+                            <i class="{{ factor.icon }}"></i>
+                            {{ factor.name }}
+                        </a>
+                    </li>
+                    {% endfor %}
+                </ul>
+            </section>
+            {% endif %}
+            {% user_sources as user_sources_loc %}
+            {% if user_sources_loc %}
+            <section class="pf-c-nav__section">
+                <h2 class="pf-c-nav__section-title">{% trans 'Sources' %}</h2>
+                <ul class="pf-c-nav__list">
+                    {% for source in user_sources_loc %}
+                    <li class="pf-c-nav__item">
+                        <a href="{{ source.view_name }}"
+                            class="pf-c-nav__link {% if user_settings.view_name == request.get_full_path %} pf-m-current {% endif %}">
+                            <i class="{{ source.icon }}"></i>
+                            {{ source.name }}
+                        </a>
+                    </li>
+                    {% endfor %}
+                </ul>
+            </section>
+            {% endif %}
+        </nav>
+    </div>
+</div>
+<main role="main" class="pf-c-page__main" tabindex="-1" id="main-content">
+    <section class="pf-c-page__main-section">
+        <div class="pf-l-split pf-m-gutter">
+            <div class="pf-l-split__item">
+                <div class="pf-c-card">
+                    {% block page %}
+                    {% endblock %}
                 </div>
             </div>
         </div>
-        <div class="pf-l-split__item">
-            <div class="pf-c-card">
-                {% block page %}
-                {% endblock %}
-            </div>
-        </div>
-    </div>
-</section>
+    </section>
+</main>
 {% endblock %}
