diff --git a/README.rst b/README.rst
index d8e742e..b11b559 100644
--- a/README.rst
+++ b/README.rst
@@ -75,6 +75,7 @@ Changelog
 - Add Flask-Debugtoolbar.
 - Migrations using Flask-Migrate.
 - Caching using Flask-Cache.
+- Add error page templates (404, 401, 500)
 
 0.2.0 (09/21/2013)
 ******************
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/nav.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/nav.html
index d4c3554..9f906b6 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/nav.html
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/_layouts/nav.html
@@ -1,5 +1,7 @@
 {% raw %}
 <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+  <div class="container">
+
   <!-- Brand and toggle get grouped for better mobile display -->
   <div class="navbar-header">
     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
@@ -21,9 +23,12 @@
       <li><a href="{{ url_for('public.about') }}">About</a></li>
     </ul>
     {% if current_user.is_authenticated() %}
-    <a class="btn btn-default btn-sm navbar-btn navbar-right" href="{{ url_for('public.logout') }}">Log out</a>
     <ul class="nav navbar-nav navbar-right">
-      <li><a href="{{ url_for('user.members') }}">Logged in as {{ current_user.username }}</a></li>
+        <li>
+            <p class="navbar-text"><a class="navbar-link" href="{{ url_for('user.members') }}">Logged in as {{ current_user.username }}</a></p>
+        </li>
+        <li><a class="navbar-link" href="{{ url_for('public.logout') }}">Log out</a></li>
+
     </ul>
     {% elif form %}
     <ul class="nav navbar-nav navbar-right">
@@ -39,5 +44,6 @@
     </form>
     {% endif %}
   </div><!-- /.navbar-collapse -->
+  </div><!-- /.container -->
 </nav>
 {% endraw %}