diff --git a/passbook/core/templates/login/base.html b/passbook/core/templates/login/base.html
index 42ecaf5b4c..cf9797e057 100644
--- a/passbook/core/templates/login/base.html
+++ b/passbook/core/templates/login/base.html
@@ -24,7 +24,7 @@
 
 {% block body %}
 <div class="toast-notifications-list-pf">
-    {% include 'partials/messages.html' with toast=True %}
+    {% include 'partials/messages.html' %}
 </div>
 <div class="login-pf-page">
     <div class="container-fluid">
diff --git a/passbook/core/templates/login/with_sources.html b/passbook/core/templates/login/with_sources.html
index ba744b8cb4..9c515f8383 100644
--- a/passbook/core/templates/login/with_sources.html
+++ b/passbook/core/templates/login/with_sources.html
@@ -24,7 +24,7 @@
 
 {% block body %}
 <div class="toast-notifications-list-pf">
-    {% include 'partials/messages.html' with toast=True %}
+    {% include 'partials/messages.html' %}
 </div>
 <div class="login-pf-page login-pf-page-accounts">
     <header class="login-pf-page-header">
diff --git a/passbook/core/templates/overview/base.html b/passbook/core/templates/overview/base.html
index f4c7366ae0..0d851c586b 100644
--- a/passbook/core/templates/overview/base.html
+++ b/passbook/core/templates/overview/base.html
@@ -5,83 +5,83 @@
 {% load is_active %}
 
 {% block body %}
+<div class="toast-notifications-list-pf">
+    {% include 'partials/messages.html' %}
+</div>
 <nav class="navbar navbar-default navbar-pf" role="navigation">
-  <div class="navbar-header">
-    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
-      <span class="sr-only">{% trans 'Toggle navigation' %}</span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-    </button>
-    <a class="navbar-brand" href="/">
-      <img src="{% static 'img/brand.svg' %}" alt="passbook" />
-    </a>
-  </div>
-  <div class="collapse navbar-collapse navbar-collapse-1">
-    <ul class="nav navbar-nav navbar-utility">
-      <li class="dropdown">
-        <button class="btn btn-link nav-item-iconic" id="horizontalDropdownMenu1" data-toggle="dropdown" aria-haspopup="true"
-          aria-expanded="true">
-          <span title="Help" class="fa pficon-help dropdown-title"></span>
+    <div class="navbar-header">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
+            <span class="sr-only">{% trans 'Toggle navigation' %}</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
         </button>
-        <ul class="dropdown-menu" aria-labelledby="horizontalDropdownMenu1">
-          {% comment %} <li><a href="#0">Help</a></li> {% endcomment %}
-          <li><a data-toggle="modal" data-target="#about-modal" href="#0">{% trans 'About' %}</a></li>
+        <a class="navbar-brand" href="/">
+            <img src="{% static 'img/brand.svg' %}" alt="passbook" />
+        </a>
+    </div>
+    <div class="collapse navbar-collapse navbar-collapse-1">
+        <ul class="nav navbar-nav navbar-utility">
+            <li class="dropdown">
+                <button class="btn btn-link nav-item-iconic" id="horizontalDropdownMenu1" data-toggle="dropdown"
+                    aria-haspopup="true" aria-expanded="true">
+                    <span title="Help" class="fa pficon-help dropdown-title"></span>
+                </button>
+                <ul class="dropdown-menu" aria-labelledby="horizontalDropdownMenu1">
+                    {% 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" data-toggle="dropdown">
+                    <span class="pficon pficon-user"></span>
+                    <span class="dropdown-title">
+                        {{ user.username }} <b class="caret"></b>
+                    </span>
+                </button>
+                <ul class="dropdown-menu">
+                    <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>
         </ul>
-      </li>
-      <li class="dropdown">
-        <button class="btn btn-link dropdown-toggle" data-toggle="dropdown">
-          <span class="pficon pficon-user"></span>
-          <span class="dropdown-title">
-            {{ user.username }} <b class="caret"></b>
-          </span>
-        </button>
-        <ul class="dropdown-menu">
-          <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>
+        {% is_active_app 'passbook_admin' as is_admin %}
+        <ul class="nav navbar-nav navbar-primary {% if is_admin == 'active' %}persistent-secondary{% endif %}">
+            <li class="{% is_active_url 'passbook_core:overview' %}">
+                <a href="{% url 'passbook_core:overview' %}">{% trans 'Overview' %}</a>
+            </li>
+            {% if user.is_superuser %}
+            <li class="{% is_active_app 'passbook_admin' %}">
+                <a href="{% url 'passbook_admin:overview' %}">{% trans 'Administration' %}</a>
+                {% block nav_secondary %}
+                {% endblock %}
+            </li>
+            {% endif %}
         </ul>
-      </li>
-    </ul>
-    {% is_active_app 'passbook_admin' as is_admin %}
-    <ul class="nav navbar-nav navbar-primary {% if is_admin == 'active' %}persistent-secondary{% endif %}">
-      <li class="{% is_active_url 'passbook_core:overview' %}">
-        <a href="{% url 'passbook_core:overview' %}">{% trans 'Overview' %}</a>
-      </li>
-      {% if user.is_superuser %}
-      <li class="{% is_active_app 'passbook_admin' %}">
-        <a href="{% url 'passbook_admin:overview' %}">{% trans 'Administration' %}</a>
-        {% block nav_secondary %}
-        {% endblock %}
-      </li>
-      {% endif %}
-    </ul>
-  </div>
+    </div>
 </nav>
 <div class="container-fluid container-cards-pf">
-  <div class="container">
-    {% include 'partials/messages.html' %}
-  </div>
-  {% block content %}
-  {% endblock %}
+    {% block content %}
+    {% endblock %}
 </div>
 {% endblock %}
 
 {% block scripts %}
 <script>
-  $(document).ready(function () {
-    // initialize tooltips
-    $('[data-toggle="tooltip"]').tooltip();
+    $(document).ready(function () {
+        // initialize tooltips
+        $('[data-toggle="tooltip"]').tooltip();
 
-    // Initialize the vertical navigation
-    $().setupVerticalNavigation(true);
-  });
+        // Initialize the vertical navigation
+        $().setupVerticalNavigation(true);
+    });
 </script>
 {% endblock %}
diff --git a/passbook/core/templates/partials/messages.html b/passbook/core/templates/partials/messages.html
index 94b4644daf..005611a302 100644
--- a/passbook/core/templates/partials/messages.html
+++ b/passbook/core/templates/partials/messages.html
@@ -1,19 +1,19 @@
 {% if messages %}
-  {% for msg in messages %}
-  <div class="{% if toast %}toast-pf{% endif %} alert alert-{{ msg.level_tag }}">
+{% for msg in messages %}
+<div class="toast-pf alert alert-dismissable alert-{{ msg.level_tag }}">
     <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-      <span class="pficon pficon-close"></span>
+        <span class="pficon pficon-close"></span>
     </button>
     {% if msg.level_tag == 'danger' %}
-      <span class="pficon pficon-error-circle-o"></span>
+    <span class="pficon pficon-error-circle-o"></span>
     {% elif msg.level_tag == 'warning' %}
-      <span class="pficon pficon-warning-triangle-o"></span>
+    <span class="pficon pficon-warning-triangle-o"></span>
     {% elif msg.level_tag == 'success' %}
-      <span class="pficon pficon-ok"></span>
+    <span class="pficon pficon-ok"></span>
     {% elif msg.level_tag == 'info' %}
-      <span class="pficon pficon-info"></span>
+    <span class="pficon pficon-info"></span>
     {% endif %}
-    <strong>{{ msg.message|safe }}</strong>
-  </div>
-  {% endfor %}
+    {{ msg.message|safe }}
+</div>
+{% endfor %}
 {% endif %}