diff --git a/Teknik/Areas/User/Views/User/_LoginPartial.cshtml b/Teknik/Areas/User/Views/User/_LoginPartial.cshtml
index 551430c..4fc8ec1 100644
--- a/Teknik/Areas/User/Views/User/_LoginPartial.cshtml
+++ b/Teknik/Areas/User/Views/User/_LoginPartial.cshtml
@@ -5,27 +5,31 @@
     {
         <li class="dropdown">
             <a href="#" id="user_menu" class="dropdown-toggle" data-toggle="dropdown">@User.Identity.Name <strong class="caret"></strong></a>
-            <ul class="dropdown-menu" role="menu" aria-labelledby="user_menu">
+            <ul class="dropdown-menu dropdown-left-manual" role="menu" aria-labelledby="user_menu">
+                <li class="text-center text-uppercase dropdown__username">Signed in as @User.Identity.Name</li>
+                <li role="separator" class="divider"></li>
                 <li>
-                    <a href="@Url.SubRouteUrl("user", "User.ViewProfile", new { username = User.Identity.Name })">Profile</a>
+                    <a href="@Url.SubRouteUrl("user", "User.ViewProfile", new { username = User.Identity.Name })"><i class="fa fa-user fa-fw"></i>&nbsp;&nbsp;Profile</a>
                 </li>
                 <li>
-                    <a href="@Url.SubRouteUrl("blog", "Blog.Blog", new { username = User.Identity.Name })">View Blog</a>
+                    <a href="@Url.SubRouteUrl("blog", "Blog.Blog", new { username = User.Identity.Name })"><i class="fa fa-book fa-fw"></i>&nbsp;&nbsp;View Blog</a>
                 </li>
                 <li>
-                    <a href="@Url.SubRouteUrl("user", "User.ViewServiceData")">Service Data</a>
+                    <a href="@Url.SubRouteUrl("user", "User.ViewServiceData")"><i class="fa fa-database fa-fw"></i>&nbsp;&nbsp;Service Data</a>
                 </li>
                 <li>
-                    <a href="@Url.SubRouteUrl("user", "User.Settings")">Settings</a>
+                    <a href="@Url.SubRouteUrl("user", "User.Settings")"><i class="fa fa-sliders fa-fw"></i>&nbsp;&nbsp;Settings</a>
                 </li>
                 @if (User.IsInRole("Admin"))
                 {
+                    <li role="separator" class="divider"></li>
                     <li>
-                        <a href="@Url.SubRouteUrl("admin", "Admin.Dashboard")">Administration</a>
+                        <a href="@Url.SubRouteUrl("admin", "Admin.Dashboard")"><i class="fa fa-cogs fa-fw"></i>&nbsp;&nbsp;Administration</a>
                     </li>
                 }
+                <li role="separator" class="divider"></li>
                 <li>
-                    <a href="@Url.SubRouteUrl("user", "User.Logout")">Log Out</a>
+                    <a href="@Url.SubRouteUrl("user", "User.Logout")"><i class="fa fa-sign-out fa-fw"></i>&nbsp;&nbsp;Log Out</a>
                 </li>
             </ul>
         </li>
diff --git a/Teknik/Content/common.css b/Teknik/Content/common.css
index 45fd4a6..761e65a 100644
--- a/Teknik/Content/common.css
+++ b/Teknik/Content/common.css
@@ -47,6 +47,23 @@ body { padding-top: 70px; }
     display: block;
  }
 
+.dropdown-left-manual {
+    right: 0;
+    left: auto;
+    padding-left: 1px;
+    padding-right: 1px;
+}
+
+.dropdown .dropdown__username {
+    text-overflow: ellipsis;
+    font-weight: bolder;
+    font-size: 12px;
+}
+
+.dropdown-menu a {
+    padding-bottom: 5px;
+}
+
 .collapse.in {
     display: block;
 }
diff --git a/Teknik/Views/Shared/_Navbar.cshtml b/Teknik/Views/Shared/_Navbar.cshtml
index 59d8736..e1fd9a1 100644
--- a/Teknik/Views/Shared/_Navbar.cshtml
+++ b/Teknik/Views/Shared/_Navbar.cshtml
@@ -38,31 +38,31 @@
 
                 <li class="dropdown">
                     <a href="#" id="services_menu" class="dropdown-toggle" data-toggle="dropdown">Services <strong class="caret"></strong></a>
-                    <ul class="dropdown-menu" role="menu" aria-labelledby="services_menu">
+                    <ul class="dropdown-menu dropdown-left-manual" role="menu" aria-labelledby="services_menu">
                         <li class="@Url.GetActive("podcast")">
-                            <a href="@Url.SubRouteUrl("podcast", "Podcast.Index")">Teknikast</a>
+                            <a href="@Url.SubRouteUrl("podcast", "Podcast.Index")"><i class="fa fa-microphone fa-fw"></i>&nbsp;&nbsp;Teknikast</a>
                         </li>
                         <li class="@Url.GetActive("upload", "u")">
-                            <a href="@Url.SubRouteUrl("upload", "Upload.Index")">Uploads</a>
+                            <a href="@Url.SubRouteUrl("upload", "Upload.Index")"><i class="fa fa-lock fa-fw"></i>&nbsp;&nbsp;Upload Files</a>
                         </li>
                         <li class="@Url.GetActive("paste", "p")">
-                            <a href="@Url.SubRouteUrl("paste", "Paste.Index")">Pastebin</a>
+                            <a href="@Url.SubRouteUrl("paste", "Paste.Index")"><i class="fa fa-code fa-fw"></i>&nbsp;&nbsp;Pastebin</a>
                         </li>
                         <li class="@Url.GetActive("shorten", "s")">
-                            <a href="@Url.SubRouteUrl("shorten", "Shortener.Index")">Shorten Url</a>
+                            <a href="@Url.SubRouteUrl("shorten", "Shortener.Index")"><i class="fa fa-link fa-fw"></i>&nbsp;&nbsp;Url Shortener</a>
                         </li>
                         <li class="@Url.GetActive("vault", "v")">
-                            <a href="@Url.SubRouteUrl("vault", "Vault.NewVault")">Vaults</a>
+                            <a href="@Url.SubRouteUrl("vault", "Vault.NewVault")"><i class="fa fa-folder fa-fw"></i>&nbsp;&nbsp;Create Vault</a>
                         </li>
                         <li role="separator" class="divider"></li>
                         <li class="@Url.GetActive("git")">
-                            <a href="@Config.GitConfig.Host">Git</a>
+                            <a href="@Config.GitConfig.Host"><i class="fa fa-git-square fa-fw"></i>&nbsp;&nbsp;Git</a>
                         </li>
                         <li class="@Url.GetActive("mail")">
-                            <a href="@Url.SubRouteUrl("mail", "Mail.Index")" target="_blank">Mail</a>
+                            <a href="@Url.SubRouteUrl("mail", "Mail.Index")" target="_blank"><i class="fa fa-envelope fa-fw"></i>&nbsp;&nbsp;Mail</a>
                         </li>
                         <li class="@Url.GetActive("mumble")">
-                            <a href="mumble://mumble.@(Config.Host):64738/?version=1.2.5" target="_blank">Mumble</a>
+                            <a href="mumble://mumble.@(Config.Host):64738/?version=1.2.5" target="_blank"><i class="fa fa-comments fa-fw"></i>&nbsp;&nbsp;Mumble</a>
                         </li>
                     </ul>
                 </li>