diff --git a/src/templates/navbar.tmpl b/src/templates/navbar.tmpl
index 26293af..89c5d12 100644
--- a/src/templates/navbar.tmpl
+++ b/src/templates/navbar.tmpl
@@ -1,58 +1,71 @@
 <nav class="navbar navbar-inverse navbar-fixed-top">
-  <div class="container-fluid">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="#">Canape</a>
-    </div>
+  <div class="container">
+    <div class="container-fluid">
+      <!-- Brand and toggle get grouped for better mobile display -->
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="#">Canape</a>
+      </div>
 
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-      <ul class="nav navbar-nav">
-          <li><p class="navbar-text">Library: </p></li>
-        <li {{ if eq $.Route "movies.polochon" }}class="active"{{ end }}>
-            <a href="{{ URL "movies.polochon" }}?limit=10">Movies{{ if eq $.Route "movies.polochon" }}<span class="sr-only">(current)</span>{{ end }}</a>
-        </li>
+      <!-- Collect the nav links, forms, and other content for toggling -->
+      <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+        <ul class="nav navbar-nav">
+          <li><a href="{{ URL "movies.explore.popular"}}">Movies</a></li>
+          <li><a href="#">TV Shows</a></li>
+        {{ if $.Data.user }}
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+              <i class="fa fa-list"></i>
+              My Library
+              <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu" role="menu">
+              <li  {{ if eq $.Route "movies.polochon" }}class="active"{{ end }}>
+                <a href="{{ URL "movies.polochon" }}?limit=10">Movies{{ if eq $.Route "movies.polochon" }}<span class="sr-only">Movies</span>{{ end }}</a>
+              </li>
+              <li>
+                <a href="#">
+                  TVShows
+                </a>
+              </li>
+            </ul>
+          </li>
+        {{ end }}
+        </ul>
 
-        <li><a href="#">TV Shows</a></li>
-
-        <li><p class="navbar-text">Explore: </p></li>
-        <li><a href="{{ URL "movies.explore.popular"}}">Movies</a></li>
-        <li><a href="#">TV Shows</a></li>
-
-      </ul>
-
-      <ul class="nav navbar-nav navbar-right">
-      {{ if $.Data.user }}
-        <li class="dropdown">
-          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{$.Data.user.Name}} <span class="caret"></span></a>
-          <ul class="dropdown-menu">
-            <li>
-              <a href="{{ URL "users.details"}}">My account</a>
-            </li>
-            <li>
-              <a href="{{ URL "users.edit"}}">Edit</a>
-            </li>
-            <li role="separator" class="divider"></li>
-            <li>
-              <a href="{{ URL "users.logout"}}">Logout</a>
-            </li>
-          </ul>
-        </li>
-      {{ else }}
         <ul class="nav navbar-nav navbar-right">
+        {{ if $.Data.user }}
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{$.Data.user.Name}} <span class="caret"></span></a>
+            <ul class="dropdown-menu">
+              <li>
+                <a href="{{ URL "users.details"}}">My account</a>
+              </li>
+              <li>
+                <a href="{{ URL "users.edit"}}">Edit</a>
+              </li>
+              <li role="separator" class="divider"></li>
+              <li>
+                <a href="{{ URL "users.logout"}}">Logout</a>
+              </li>
+            </ul>
+          </li>
+        {{ else }}
           <li>
             <a href="{{ URL "users.login"}}">Sign in</a>
           </li>
+          <li>
+            <a href="{{ URL "users.signup"}}">Sign up</a>
+          </li>
+        {{ end }}
         </ul>
-      {{ end }}
-      </ul>
 
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
+      </div><!-- /.navbar-collapse -->
+    </div><!-- /.container-fluid -->
+  </div><!-- /.container -->
 </nav>