diff --git a/passbook/core/templates/base/skeleton.html b/passbook/core/templates/base/skeleton.html
index cc3935343..80b231e4a 100644
--- a/passbook/core/templates/base/skeleton.html
+++ b/passbook/core/templates/base/skeleton.html
@@ -46,9 +46,6 @@
   <script src="{% static 'js/passbook.js' %}"></script>
   {% block scripts %}
   {% endblock %}
-  <div class="modals">
-    {% include 'partials/about_modal.html' %}
-  </div>
 </body>
 
 </html>
diff --git a/passbook/core/templates/base/skeleton_login.html b/passbook/core/templates/base/skeleton_login.html
index a747775c9..1c6e955c4 100644
--- a/passbook/core/templates/base/skeleton_login.html
+++ b/passbook/core/templates/base/skeleton_login.html
@@ -46,9 +46,6 @@
   <script src="{% static 'js/passbook.js' %}"></script>
   {% block scripts %}
   {% endblock %}
-  <div class="modals">
-    {% include 'partials/about_modal.html' %}
-  </div>
 </body>
 
 </html>
diff --git a/passbook/core/templates/overview/base.html b/passbook/core/templates/overview/base.html
index 04982586d..f48a0f234 100644
--- a/passbook/core/templates/overview/base.html
+++ b/passbook/core/templates/overview/base.html
@@ -23,37 +23,18 @@
     </div>
     <nav class="collapse navbar-collapse">
         <ul class="nav navbar-nav navbar-right navbar-iconic navbar-utility">
-            <li class="dropdown">
-                <button class="btn btn-link dropdown-toggle nav-item-iconic" id="dropdownMenu1" data-toggle="dropdown"
-                    aria-haspopup="true" aria-expanded="true">
-                    <span title="Help" class="fa pficon-help"></span>
-                </button>
-                <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-                    {% comment %} <li><a href="#0">Help</a></li> {% endcomment %}
-                    <li><a data-toggle="modal" data-target="#about-modal" href="#0">{% trans 'About' %}</a></li>
-                </ul>
-            </li>
-            <li class="dropdown">
-                <button class="btn btn-link dropdown-toggle nav-item-iconic" id="dropdownMenu2" data-toggle="dropdown"
-                    aria-haspopup="true" aria-expanded="true">
-                    <span title="Username" class="fa pficon-user"></span>
-                    <span class="dropdown-title">
-                        {{ user.username }} <span class="caret"></span>
-                    </span>
-                </button>
-                <ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
-                    <li>
-                        <a href="{% url 'passbook_core:user-settings' %}">{% trans 'User Settings' %}</a>
-                    </li>
-                    <li>
-                        <a href="{% url 'passbook_core:user-change-password' %}">{% trans 'Change Password' %}</a>
-                    </li>
-                    <li class="divider"></li>
-                    <li>
-                        <a href="{% url 'passbook_core:auth-logout' %}">{% trans 'Logout' %}</a>
-                    </li>
-                </ul>
-            </li>
+            <a href="{% url 'passbook_core:auth-logout' %}" class="btn btn-link nav-item-iconic" aria-haspopup="true" aria-expanded="true">
+                <span title="Username" class="fa fa-sign-out"></span>
+                <span class="dropdown-title">
+                    {% trans 'Logout' %}
+                </span>
+            </a>
+            <a href="{% url 'passbook_core:user-settings' %}" class="btn btn-link nav-item-iconic" aria-haspopup="true" aria-expanded="true">
+                <span title="Username" class="fa pficon-user"></span>
+                <span class="dropdown-title">
+                    {{ user.username }}
+                </span>
+            </a>
         </ul>
     </nav>
 </nav>
diff --git a/passbook/core/templates/partials/about_modal.html b/passbook/core/templates/partials/about_modal.html
deleted file mode 100644
index fc5251b70..000000000
--- a/passbook/core/templates/partials/about_modal.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% load static %}
-{% load i18n %}
-{% load cache %}
-
-{% load utils %}
-
-<div class="modal fade" id="about-modal" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content about-modal-pf">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                    <span class="pficon pficon-close"></span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <h1>{% trans 'passbook' %}</h1>
-                <div class="product-versions-pf">
-                    <ul class="list-unstyled">
-                        {% app_versions as vers %}
-                        {% cache 600 versions %}
-                        {% for app, ver in vers.items %}
-                        <li><strong>{{ app }}</strong> {{ ver }}</li>
-                        {% endfor %}
-                        {% endcache %}
-                    </ul>
-                </div>
-                <div class="trademark-pf">
-                    Trademark and Copyright Information
-                </div>
-            </div>
-            <div class="modal-footer">
-                <img style="max-height:64px;" src="{% static 'img/logo.png' %}" alt=" Symbol">
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/passbook/core/templates/user/base.html b/passbook/core/templates/user/base.html
index 58b0bac53..953dd39e4 100644
--- a/passbook/core/templates/user/base.html
+++ b/passbook/core/templates/user/base.html
@@ -16,23 +16,27 @@
                         <i class="fa pficon-edit"></i> {% trans 'Details' %}
                     </a>
                 </li>
-                <li class="nav-divider"></li>
                 {% user_factors as uf %}
+                {% if uf %}
+                    <li class="nav-divider"></li>
+                {% endif %}
                 {% for user_settings in uf %}
-                <li class="{% is_active user_settings.view_name %}">
-                     <a href="{% url user_settings.view_name %}">
-                         <i class="{{ user_settings.icon }}"></i> {{ user_settings.name }}
-                    </a>
-                </li>
+                    <li class="{% is_active user_settings.view_name %}">
+                        <a href="{% url user_settings.view_name %}">
+                            <i class="{{ user_settings.icon }}"></i> {{ user_settings.name }}
+                        </a>
+                    </li>
                 {% endfor %}
-                <li class="nav-divider"></li>
                 {% user_sources as us %}
+                {% if us %}
+                    <li class="nav-divider"></li>
+                {% endif %}
                 {% for user_settings in us %}
-                <li class="{% if user_settings.view_name == request.get_full_path %} active {% endif %}">
-                    <a href="{{ user_settings.view_name }}">
-                        <i class="{{ user_settings.icon }}"></i> {{ user_settings.name }}
-                    </a>
-                </li>
+                    <li class="{% if user_settings.view_name == request.get_full_path %} active {% endif %}">
+                        <a href="{{ user_settings.view_name }}">
+                            <i class="{{ user_settings.icon }}"></i> {{ user_settings.name }}
+                        </a>
+                    </li>
                 {% endfor %}
             </ul>
         </div>