diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl
index 475c62f..80578d2 100644
--- a/templates/base/head_navbar.tmpl
+++ b/templates/base/head_navbar.tmpl
@@ -142,7 +142,7 @@
                         <span class="mobile-only">{{.SignedUser.Name}}</span>
                         <span class="fitted not-mobile" tabindex="-1">{{svg "octicon-triangle-down"}}</span>
                     </span>
-                    <div class="menu user-menu" tabindex="-1">
+                    <div class="menu user-menu" tabindex="-1" style="display: inline-block;">
                         <div class="ui header">
                             {{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
                         </div>
@@ -158,14 +158,14 @@
                                 {{.i18n.Tr "your_starred"}}
                             </a>
                         {{end}}
-                        <a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
+                        <a class="{{if .PageIsUserSettings}}active{{end}} button-default" href="{{AppSubUrl}}/user/settings">
                             {{svg "octicon-tools"}}
                             {{.i18n.Tr "your_settings"}}<!-- Your settings -->
                         </a>
                         {{if .IsAdmin}}
                             <div class="divider"></div>
 
-                            <a class="{{if .PageIsAdmin}}active{{end}} item" href="{{AppSubUrl}}/admin">
+                            <a class="{{if .PageIsAdmin}}active{{end}} button-default" href="{{AppSubUrl}}/admin">
                                 {{svg "octicon-server"}}
                                 {{.i18n.Tr "admin_panel"}}<!-- Admin Panel -->
                             </a>