diff --git a/sass/base_theme.scss b/sass/base_theme.scss
index ec5bd98..e4e2a37 100644
--- a/sass/base_theme.scss
+++ b/sass/base_theme.scss
@@ -45,7 +45,30 @@ a:hover {
   background: $primary-color;
   color: $background-color;
 }
-
+#admin-menu {
+  list-style-type: none;
+  display: inline;
+  padding: 10px;
+  width: 720px;
+  margin:0 auto;
+  background: $color-menu-background;
+  color: $color-light;
+  border-radius-bottom-left: 2px;
+  border-radius-bottom-right: 2px;
+  .left { float: left; }
+  .right { float: right; }
+  li {
+     a { text-decoration: none; }
+    .admin-title {
+       text-transform: uppercase;
+       font-weight: bold;
+    }
+    padding-right:10px;
+    .selected, a:hover {
+      color: $primary-color;
+    }
+  }
+}
 #header {
   margin-bottom: 70px;
 
@@ -69,7 +92,6 @@ a:hover {
       padding: 0;
       li {
         float:left;
-        padding-right:10px;
         margin-bottom:10px;
       }
     }
diff --git a/templates/header.html b/templates/header.html
index 0bfe9a4..1eb54a8 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -19,13 +19,6 @@
 <li><a href="/following"{% if request.path == "/following" %} class="selected" {% endif %}>Following <small class="badge">{{ following_count }}</small></a></li>
 <!-- <li><a href="/about"{% if request.path == "/about" %} class="selected" {% endif %}>/about</a></li>
 -->
-{% if logged_in %}
-<li><a href="/stream"{% if request.path == "/stream" %} class="selected" {% endif %}>/stream</a></li>
-<li><a href="/notifications"{% if request.path == "/notifications" %} class="selected" {% endif %}>/notifs</a></li>
-<li><a href="/new"{% if request.path == "/new" %} class="selected" {% endif %}>/new</a></li>
-<li><a href="/admin"{% if request.path == "/admin" %} class="selected" {% endif %}>/admin</a></li>
-<li><a href="/logout">/logout</a></li>
-{% endif %}
 </ul>
 </div>
 </div>
diff --git a/templates/layout.html b/templates/layout.html
index 4c74129..cece912 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -19,6 +19,18 @@
 </style>
 </head>
 <body>
+{% if logged_in %}
+<ul id="admin-menu">
+<li class="left"><span class="admin-title">Admin</span></li>
+<li class="left"><a href="/new"{% if request.path == "/new" %} class="selected" {% endif %}>New</a></li>
+<li class="left"><a href="/stream"{% if request.path == "/stream" %} class="selected" {% endif %}>Stream</a></li>
+<li class="left"><a href="/notifications"{% if request.path == "/notifications" %} class="selected" {% endif %}>Notifications</a></li>
+<li class="left"><a href="/admin"{% if request.path == "/admin" %} class="selected" {% endif %}>Stats</a></li>
+<li class="right"><a href="/logout">Logout</a></li>
+</ul>
+{% endif %}
+
+
 <div class="base-container">
 {% block content %}{% endblock %}
 </div>
