diff --git a/guacamole/src/main/webapp/app/home/templates/home.html b/guacamole/src/main/webapp/app/home/templates/home.html
index 6dc4f6a74..7b3b5fc99 100644
--- a/guacamole/src/main/webapp/app/home/templates/home.html
+++ b/guacamole/src/main/webapp/app/home/templates/home.html
@@ -24,17 +24,17 @@
 
     <div class="connection-list-ui">
 
-        <!-- User menu -->
-        <guac-user-menu permissions="permissions"></guac-user-menu>
-
         <!-- The recent connections for this user -->
-        <h2>{{'HOME.SECTION_HEADER_RECENT_CONNECTIONS' | translate}}</h2>
+        <div class="header">
+            <h2>{{'HOME.SECTION_HEADER_RECENT_CONNECTIONS' | translate}}</h2>
+            <guac-user-menu permissions="permissions"></guac-user-menu>
+        </div>
         <div class="recent-connections">
             <guac-recent-connections root-group="rootConnectionGroup"></guac-recent-connections>
         </div>
 
         <!-- All connections for this user -->
-        <h2>{{'HOME.SECTION_HEADER_ALL_CONNECTIONS' | translate}}</h2>
+        <h2 class="header">{{'HOME.SECTION_HEADER_ALL_CONNECTIONS' | translate}}</h2>
         <div class="all-connections">
             <guac-group-list
                 connection-group="rootConnectionGroup"
diff --git a/guacamole/src/main/webapp/app/index/styles/ui.css b/guacamole/src/main/webapp/app/index/styles/ui.css
index 1be5a3a96..3e20f1eb3 100644
--- a/guacamole/src/main/webapp/app/index/styles/ui.css
+++ b/guacamole/src/main/webapp/app/index/styles/ui.css
@@ -51,12 +51,15 @@ h1 {
 }
 
 h2 {
-
     font-size: 1.25em;
     font-weight: bold;
-    padding: 0.75em 0.5em;
-
     text-transform: uppercase;
+    padding: 0.75em 0.5em;
+    margin: 0;
+}
+
+.header {
+
     border-bottom: 1px solid rgba(0, 0, 0, 0.125);
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.125);
     background: rgba(0, 0, 0, 0.04);
@@ -64,13 +67,47 @@ h2 {
     margin-bottom: 1em;
     margin-top: 0;
     border-top: none;
+
+    /* IE10 */
+    display: -ms-flexbox;
+    -ms-flex-align: stretch;
+    -ms-flex-direction: row;
+
+    /* Ancient Mozilla */
+    display: -moz-box;
+    -moz-box-align: stretch;
+    -moz-box-orient: horizontal;
+    
+    /* Ancient WebKit */
+    display: -webkit-box;
+    -webkit-box-align: stretch;
+    -webkit-box-orient: horizontal;
+
+    /* Old WebKit */
+    display: -webkit-flex;
+    -webkit-align-items: stretch;
+    -webkit-flex-direction: row;
+
+    /* W3C */
+    display: flex;
+    align-items: stretch;
+    flex-direction: row;
+
 }
 
-h2 ~ h2 {
+.header ~ .header {
     margin-top: 1em;
     border-top: 1px solid rgba(0, 0, 0, 0.125);
 }
 
+.header h2 {
+    -ms-flex: 1 1 auto;
+    -moz-box-flex: 1;
+    -webkit-box-flex: 1;
+    -webkit-flex: 1 1 auto;
+    flex: 1 1 auto;
+}
+
 div.section {
     margin: 1em;
     padding: 0;
diff --git a/guacamole/src/main/webapp/app/manage/templates/manage.html b/guacamole/src/main/webapp/app/manage/templates/manage.html
index 483da6d4f..638f5b9d4 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manage.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manage.html
@@ -22,10 +22,10 @@ THE SOFTWARE.
 
 <div class="view" ng-class="{loading: !isLoaded()}">
 
-    <!-- User menu -->
-    <guac-user-menu permissions="permissions"></guac-user-menu>
-
-    <h2>{{'MANAGE.SECTION_HEADER_ADMINISTRATION' | translate}}</h2>
+    <div class="header">
+        <h2>{{'MANAGE.SECTION_HEADER_ADMINISTRATION' | translate}}</h2>
+        <guac-user-menu permissions="permissions"></guac-user-menu>
+    </div>
 
     <!-- User management -->
     <div class="settings section" ng-show="canManageUsers">
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
index 723c29c89..41c8db37b 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageConnection.html
@@ -22,11 +22,11 @@ THE SOFTWARE.
 
 <div class="view" ng-class="{loading: !isLoaded()}">
 
-    <!-- User menu -->
-    <guac-user-menu permissions="permissions"></guac-user-menu>
-
     <!-- Main property editor -->
-    <h2>{{'MANAGE_CONNECTION.SECTION_HEADER_EDIT_CONNECTION' | translate}}</h2>
+    <div class="header">
+        <h2>{{'MANAGE_CONNECTION.SECTION_HEADER_EDIT_CONNECTION' | translate}}</h2>
+        <guac-user-menu permissions="permissions"></guac-user-menu>
+    </div>
     <div class="section">
         <table class="properties">
             
@@ -58,7 +58,7 @@ THE SOFTWARE.
     </div>
 
     <!-- Connection parameters -->
-    <h2>{{'MANAGE_CONNECTION.SECTION_HEADER_PARAMETERS' | translate}}</h2>
+    <h2 class="header">{{'MANAGE_CONNECTION.SECTION_HEADER_PARAMETERS' | translate}}</h2>
     <div class="section" ng-class="{loading: !parameters}">
         <table class="properties">
             
@@ -81,7 +81,7 @@ THE SOFTWARE.
     </div>
 
     <!-- Connection history -->
-    <h2>{{'MANAGE_CONNECTION.SECTION_HEADER_HISTORY' | translate}}</h2>
+    <h2 class="header">{{'MANAGE_CONNECTION.SECTION_HEADER_HISTORY' | translate}}</h2>
     <div class="history section" ng-class="{loading: !historyEntryWrappers}">
         <p ng-hide="historyEntryWrappers.length">{{'MANAGE_CONNECTION.INFO_CONNECTION_NOT_USED' | translate}}</p>
 
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html b/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html
index 2e5fe1257..7986c735d 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageConnectionGroup.html
@@ -22,11 +22,11 @@ THE SOFTWARE.
 
 <div class="view" ng-class="{loading: !isLoaded()}">
 
-    <!-- User menu -->
-    <guac-user-menu permissions="permissions"></guac-user-menu>
-
     <!-- Main property editor -->
-    <h2>{{'MANAGE_CONNECTION_GROUP.SECTION_HEADER_EDIT_CONNECTION_GROUP' | translate}}</h2>
+    <div class="header">
+        <h2>{{'MANAGE_CONNECTION_GROUP.SECTION_HEADER_EDIT_CONNECTION_GROUP' | translate}}</h2>
+        <guac-user-menu permissions="permissions"></guac-user-menu>
+    </div>
     <div class="section">
         <table class="properties">
                         
diff --git a/guacamole/src/main/webapp/app/manage/templates/manageUser.html b/guacamole/src/main/webapp/app/manage/templates/manageUser.html
index a066249f0..65c34eb06 100644
--- a/guacamole/src/main/webapp/app/manage/templates/manageUser.html
+++ b/guacamole/src/main/webapp/app/manage/templates/manageUser.html
@@ -22,11 +22,11 @@ THE SOFTWARE.
 
 <div class="view" ng-class="{loading: !isLoaded()}">
 
-    <!-- User menu -->
-    <guac-user-menu permissions="permissions"></guac-user-menu>
-
     <!-- Main property editor -->
-    <h2>{{'MANAGE_USER.SECTION_HEADER_EDIT_USER' | translate}}</h2>
+    <div class="header">
+        <h2>{{'MANAGE_USER.SECTION_HEADER_EDIT_USER' | translate}}</h2>
+        <guac-user-menu permissions="permissions"></guac-user-menu>
+    </div>
     <div class="section">
         <table class="properties">
             <tr>
@@ -48,7 +48,7 @@ THE SOFTWARE.
     </div>
 
     <!-- System permissions section -->
-    <h2>{{'MANAGE_USER.SECTION_HEADER_PERMISSIONS' | translate}}</h2>
+    <h2 class="header">{{'MANAGE_USER.SECTION_HEADER_PERMISSIONS' | translate}}</h2>
     <div class="section">
         <table class="properties">
             <tr ng-repeat="systemPermissionType in systemPermissionTypes">
@@ -60,7 +60,7 @@ THE SOFTWARE.
     </div>
         
     <!-- Connection and connection group permission section -->
-    <h2>{{'MANAGE_USER.SECTION_HEADER_CONNECTIONS' | translate}}</h2>
+    <h2 class="header">{{'MANAGE_USER.SECTION_HEADER_CONNECTIONS' | translate}}</h2>
     <div class="section" ng-class="{loading: !rootGroup}">
         <guac-group-list
             context="groupListContext"
diff --git a/guacamole/src/main/webapp/app/userMenu/styles/user-menu.css b/guacamole/src/main/webapp/app/userMenu/styles/user-menu.css
index 895e2a998..b32e3c529 100644
--- a/guacamole/src/main/webapp/app/userMenu/styles/user-menu.css
+++ b/guacamole/src/main/webapp/app/userMenu/styles/user-menu.css
@@ -20,14 +20,42 @@
  * THE SOFTWARE.
  */
 
-.user-menu {
-    float: right;
+.user-menu .user-menu-dropdown {
+
     position: relative;
+    border-left: 1px solid rgba(0,0,0,0.125);
+    background: rgba(0,0,0,0.04);
+
+    /* IE10 */
+    display: -ms-flexbox;
+    -ms-flex-align: center;
+    -ms-flex-direction: row;
+
+    /* Ancient Mozilla */
+    display: -moz-box;
+    -moz-box-align: center;
+    -moz-box-orient: horizontal;
+    
+    /* Ancient WebKit */
+    display: -webkit-box;
+    -webkit-box-align: center;
+    -webkit-box-orient: horizontal;
+
+    /* Old WebKit */
+    display: -webkit-flex;
+    -webkit-align-items: center;
+    -webkit-flex-direction: row;
+
+    /* W3C */
+    display: flex;
+    align-items: center;
+    flex-direction: row;
+
+    z-index: 5;
+    
 }
 
-.user-menu a.username {
-
-    display: block;
+.user-menu .username {
 
     margin: 0;
     min-width: 1.75in;
@@ -35,8 +63,6 @@
     font-size: 1.25em;
     font-weight: bold;
     padding: .75em .5em;
-    border-left: 1px solid rgba(0,0,0,0.125);
-    background: rgba(0,0,0,0.04);
 
     padding-left: 2em;
     background-repeat: no-repeat;
@@ -44,21 +70,27 @@
     background-position: 0.5em 0.75em;
     background-image: url('images/user-icons/guac-user.png');
 
+    -ms-flex: 0 0 auto;
+    -moz-box-flex: 0;
+    -webkit-box-flex: 0;
+    -webkit-flex: 0 0 auto;
+    flex: 0 0 auto;
+   
 }
 
 .user-menu .options {
 
     position: absolute;
+    top: 100%;
     right: 0;
+    left: -1px;
     margin: 0;
     padding: 0;
-    min-width: 100%;
 
     background: #EEE;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.125);
     border-left: 1px solid rgba(0,0,0,0.125);
     border-bottom: 1px solid rgba(0,0,0,0.125);
-    z-index: 0;
 
 }
 
@@ -121,7 +153,7 @@
     margin: 1em;
     right: 0;
     top: 0;
-    z-index: 1;
+    z-index: 8;
 }
 
 .user-menu .password-dialog.shown {
diff --git a/guacamole/src/main/webapp/app/userMenu/templates/guacUserMenu.html b/guacamole/src/main/webapp/app/userMenu/templates/guacUserMenu.html
index 0a2cb0850..db2bd0731 100644
--- a/guacamole/src/main/webapp/app/userMenu/templates/guacUserMenu.html
+++ b/guacamole/src/main/webapp/app/userMenu/templates/guacUserMenu.html
@@ -21,15 +21,17 @@
        THE SOFTWARE.
     -->
 
-    <a class="username">{{username}}</a>
-    
-    <!-- Menu options -->
-    <ul class="options">
-        <li><a class="home" href="#/">{{'USER_MENU.ACTION_NAVIGATE_HOME' | translate}}</a></li>
-        <li><a class="manage" ng-show="canManageGuacamole" href="#/manage/">{{'USER_MENU.ACTION_MANAGE' | translate}}</a></li>
-        <li><a class="change-password" ng-click="showPasswordUpdate()" ng-show="canChangePassword">{{'USER_MENU.ACTION_CHANGE_PASSWORD' | translate}}</a></li>
-        <li><a class="logout" ng-click="logout()">{{'USER_MENU.ACTION_LOGOUT' | translate}}</a></li>
-    </ul>
+    <div class="user-menu-dropdown">
+        <div class="username">{{username}}</div>
+        
+        <!-- Menu options -->
+        <ul class="options">
+            <li><a class="home" href="#/">{{'USER_MENU.ACTION_NAVIGATE_HOME' | translate}}</a></li>
+            <li><a class="manage" ng-show="canManageGuacamole" href="#/manage/">{{'USER_MENU.ACTION_MANAGE' | translate}}</a></li>
+            <li><a class="change-password" ng-click="showPasswordUpdate()" ng-show="canChangePassword">{{'USER_MENU.ACTION_CHANGE_PASSWORD' | translate}}</a></li>
+            <li><a class="logout" ng-click="logout()">{{'USER_MENU.ACTION_LOGOUT' | translate}}</a></li>
+        </ul>
+    </div>
 
     <!-- Password dialog -->
     <div class="password-dialog" ng-class="{shown: showPasswordDialog}">