diff --git a/reviewboard/static/rb/css/common.less b/reviewboard/static/rb/css/common.less
index 22f18de92d19222b7fa1f3c0b0a114aef42c43af..6c07ca5589010f77f831569d626accd63d0c4228 100644
--- a/reviewboard/static/rb/css/common.less
+++ b/reviewboard/static/rb/css/common.less
@@ -81,8 +81,8 @@ ul.errorlist {
  * Banners
  ****************************************************************************/
 .banner {
-  background: #cdff9c;
-  border: 1px #4e9a06 solid;
+  background: @draft-bg-color;
+  border: 1px @draft-border-color solid;
   margin-bottom: 10px;
   padding: 8px 10px;
   z-index: 999;
@@ -107,7 +107,9 @@ ul.errorlist {
   background-image: url('../images/box_top_bg.png');
   background-position: top left;
   background-repeat: repeat-x;
-  border: 1px #888A85 solid;
+  border: 1px @box-border-color solid;
+  .border-radius(@box-border-radius);
+  .box-shadow(@box-shadow);
 }
 
 .box.important {
@@ -157,7 +159,7 @@ ul.errorlist {
     margin: 0;
     padding: 0;
     position: relative;
-    top: -23px;
+    top: -20px;
   }
 }
 
@@ -172,6 +174,7 @@ ul.errorlist {
   margin: 0;
   padding: 5px 10px 5px 5px;
   font-size: 120%;
+  .border-radius(@box-border-radius @box-border-radius 0 0);
 }
 
 .box .main {
@@ -179,7 +182,6 @@ ul.errorlist {
 }
 
 .box-container {
-  border: 1px #DCDCDC solid;
   margin-bottom: 10px;
   width: 100%;
 }
@@ -190,6 +192,7 @@ ul.errorlist {
   background-position: bottom left;
   background-repeat: repeat-x;
   padding-bottom: 1px; /* IE wants this and it does no harm. */
+  .border-radius(@box-border-radius);
 }
 
 .box-inner form {
@@ -198,7 +201,15 @@ ul.errorlist {
 
 .datagrid-title,
 .datagrid-titlebox {
-  background: #a2bedc url('../images/title_box_top_bg.png') repeat-x top left;
+  background: @box-title-bg;
+}
+
+.datagrid-header {
+  border-top: 0;
+}
+
+.datagrid-menu {
+  border: 1px #888A85 solid;
 }
 
 .datagrid .shipit-count {
@@ -212,9 +223,7 @@ ul.errorlist {
   font-weight: bold;
   padding: 0.05em 0.5em;
   white-space: nowrap;
-  -moz-border-radius: 10px;
-  -webkit-border-radius: 8px; /* WebKit bug */
-  border-radius: 10px;
+  .border-radius(10px);
 }
 
 .server-error-box .response-data {
@@ -370,17 +379,143 @@ form table td {
   }
 }
 
+#headerbar {
+  background: @headerbar-bg;
+  border-bottom: 1px #DDDDDD solid;
+  color: white;
+  margin: 0;
+  padding: @headerbar-padding;
+
+  br {
+    clear: both;
+    height: 0;
+  }
+
+  #title {
+    color: white;
+    display: inline;
+    font-weight: normal;
+    font-size: 120%;
+    vertical-align: middle;
+    margin: 0;
+    padding: 0;
+
+    a {
+      color: white;
+      font-size: 120%;
+      text-decoration: none;
+    }
+
+    .version {
+      color: #E0E0E0;
+      font-weight: normal;
+      font-size: 90%;
+    }
+  }
+
+  #logo {
+    position: absolute;
+    top: 0px;
+    left: @headerbar-logo-padding-horiz;
+  }
+
+  #search {
+   float: right;
+   margin: 0 1em;
+
+   input {
+     border: 1px black solid;
+     margin: 0;
+     padding: 2px;
+     .border-radius(6px);
+     background-color: #EEEEEE;
+   }
+  }
+}
+
+#rbinfo {
+  float: left;
+  position: absolute;
+  left: 0;
+  padding-top: 0.2em;
+  padding-left: @headerbar-padding-left;
+
+  img {
+    display: inline;
+    vertical-align: middle;
+  }
+}
+
 #accountnav {
   list-style: none;
   margin: 0;
-  padding: 0.5em;
-  text-align: right;
-  position: relative;
+  padding: 0;
   z-index: 1;
-  border-bottom: 1px #DDDDDD solid;
+  float: right;
 
   li {
-    display: inline;
+    display: block;
+    float: right;
+    margin: -@headerbar-padding 0;
+    padding: 0;
+    position: relative;
+
+    &:hover {
+      background: @headerbar-bg-active;
+
+      ul {
+        display: block;
+      }
+    }
+
+    a {
+      color: white;
+      display: block;
+      font-size: 120%;
+      margin: 0;
+      padding: 0 1em;
+      text-decoration: none;
+      height: 32px;
+      vertical-align: middle;
+      line-height: 32px;
+
+      &.user-nav-item {
+        padding-left: 0.2em;
+      }
+    }
+
+    img {
+      display: inline;
+      vertical-align: middle;
+      margin: 0;
+      padding: 0;
+    }
+
+    ul {
+      background-color: @headerbar-bg;
+      display: none;
+      margin: 0;
+      min-width: @headerbar-menu-min-width;
+      padding: 0;
+      position: absolute;
+      right: 0;
+      .border-radius(0 0 @box-border-radius @box-border-radius);
+
+      li {
+        float: none;
+        margin: 0;
+        padding: 0;
+        text-align: right;
+
+        &:hover {
+          .border-radius(0 0 @box-border-radius @box-border-radius);
+        }
+
+        a {
+          margin: 0;
+        }
+      }
+    }
   }
 }
 
@@ -439,29 +574,24 @@ form table td {
   font-size: 9pt;
 }
 
-#navbar-outer {
-  border: 1px #E0E0E0 solid;
-  margin: 10px 0;
-  width: 100%;
-}
-
 #navbar {
-  background-color: #C6DCF3;
-  border: 1px #3465A4 solid;
+  background: @navbar-bg;
+  border-bottom: 1px @navbar-border-color solid;
   list-style: none;
-  margin: 0;
-  padding: 9px 6px;
+  margin: 0 0 1em 0;
+  min-height: 1.5em;
+  padding: @headerbar-padding;
+  padding-left: @headerbar-padding-left;
 
   li {
     display: inline;
     height: 30px;
-    margin-right: 14px;
+    margin: 0 1em 0 0;
   }
 
   a {
-    color: #0000AA;
+    color: @navbar-text-color;
     font-size: 110%;
-    font-weight: bold;
     text-decoration: none;
   }
 
@@ -474,40 +604,12 @@ form table td {
   padding: 0 0.8em 0.8em 0.8em;
 }
 
-#rbinfo {
-  position: relative;
-  padding-left: 0.8em;
-
-  img {
-    display: inline;
-    vertical-align: middle;
-  }
-}
-
 #searchbar {
   position: absolute;
   right: 0;
   margin-top: -3px;
 }
 
-#title {
-  display: inline;
-  vertical-align: middle;
-  font-size: 24pt;
-  font-weight: normal;
-
-  a {
-    color: black;
-    text-decoration: none;
-  }
-
-  .version {
-    color: #808080;
-    font-size: 12pt;
-    font-weight: normal;
-  }
-}
-
 
 /****************************************************************************
  * Auto-complete widget
@@ -567,10 +669,8 @@ form table td {
   position: absolute;
   min-width: 30em;
   z-index: 25;
-  -moz-border-radius: 10px;
-  -webkit-border-radius: 8px; /* WebKit bug */
-  border-radius: 10px;
-  .box-shadow (0px 0px 4px #000);
+  .border-radius(10px);
+  .box-shadow(0px 0px 4px #000);
 
   &.loading {
     background-image: url("../images/spinner.gif");
diff --git a/reviewboard/static/rb/css/dashboard.less b/reviewboard/static/rb/css/dashboard.less
index 49ea0dc38fb019a3a0ac62912d377f75ac94d78f..784eda989d508d17c27600b2d5f175122b53f7a5 100644
--- a/reviewboard/static/rb/css/dashboard.less
+++ b/reviewboard/static/rb/css/dashboard.less
@@ -1,3 +1,6 @@
+@import "defs.less";
+
+
 /****************************************************************************
  * Dashboard
  ****************************************************************************/
@@ -5,12 +8,19 @@
   border-left: 1px black solid;
   vertical-align: top;
   margin-left: 18em;
-  background-color: white;
 
   table:after {
     clear: both;
   }
 
+  .datagrid-titlebox {
+    .border-radius(0 @box-inner-border-radius 0 0);
+  }
+
+  .datagrid-title {
+    background: transparent;
+  }
+
   .main {
     padding: 0;
   }
@@ -25,7 +35,6 @@
   width: 18em;
 
   td {
-    font-size: 0.9em;
     padding: 5px 8px;
 
     img {
@@ -84,9 +93,13 @@
   }
 }
 
-#dashboard-navbar tr,
+#dashboard-navbar tr {
+  background: transparent;
+}
+
 #dashboard-wrapper {
   background-color: #E9E9E9;
+  .border-radius(@box-inner-border-radius);
 }
 
 // vim: set et ts=2 sw=2:
diff --git a/reviewboard/static/rb/css/defs.less b/reviewboard/static/rb/css/defs.less
index bb5399914278e9c9207e4a25579c4f6dc1345460..74d2e0e2d708ac85f0c46a21f25480ac2ed4e4b8 100644
--- a/reviewboard/static/rb/css/defs.less
+++ b/reviewboard/static/rb/css/defs.less
@@ -7,6 +7,45 @@
 @light-blue: #C6DCF3;
 @dark-blue: #3465A4;
 
+@headerbar-logo-padding-horiz: 6px;
+@headerbar-logo-width: 60px;
+@headerbar-padding-left: @headerbar-logo-width +
+                         2 * @headerbar-logo-padding-horiz;
+@headerbar-bg: #333333;
+@headerbar-bg-active: #555555;
+@headerbar-padding: 0.5em;
+@headerbar-menu-min-width: 9em;
+
+@navbar-bg: @light-blue;
+@navbar-border-color: @dark-blue;
+@navbar-text-color: #0000AA;
+
+@box-border-color: #888A85;
+@box-border-radius: 6px;
+@box-inner-border-radius: @box-border-radius - 1px;
+@box-title-bg: @light-blue;
+@box-shadow: 1px 1px 2px rgba(0, 0, 0, .15);
+
+@draft-bg-color: #CDFF9C;
+@draft-border-color: darken(@draft-bg-color, 50%);
+
+@review-request-actions-bg: @review-request-action-primary-bg;
+@review-request-actions-border-color:
+  darken(@review-request-action-primary-bg, 40%);
+
+@review-request-action-bg: #E5D7A8;
+@review-request-action-border-color: @review-request-actions-border-color;
+@review-request-action-active-bg: darken(@review-request-action-bg, 20%);
+@review-request-action-hover-bg: darken(@review-request-action-bg, 12%);
+
+@review-request-action-primary-bg: @review-request-action-bg;
+@review-request-action-primary-active-bg: @review-request-action-active-bg;
+@review-request-action-primary-hover-bg: @review-request-action-hover-bg;
+
+@review-request-action-menu-border-color: @review-request-actions-border-color;
+@review-request-action-menu-bg: @review-request-action-active-bg;
+@review-request-action-menu-item-hover-bg: @review-request-action-hover-bg;
+
 .border-radius () {
   -moz-border-radius: @arguments;
   -webkit-border-radius: @arguments;
diff --git a/reviewboard/static/rb/css/reviews.less b/reviewboard/static/rb/css/reviews.less
index c5d1a93d588951cf28918d0d2dc8d742eb6715d4..b5d791bd15f4446057efa9fdd26b03cb73dd015e 100644
--- a/reviewboard/static/rb/css/reviews.less
+++ b/reviewboard/static/rb/css/reviews.less
@@ -83,6 +83,10 @@
     border-top: 1px #C2C1B0 solid;
   }
 
+  .main {
+    clear: both;
+  }
+
   #required-field-legend {
     color: darkRed;
     font-weight: bold;
@@ -189,11 +193,18 @@
     }
   }
 
+  .actions-container {
+    background: @review-request-actions-bg;
+    border-bottom: 2px @review-request-actions-border-color solid;
+    float: right;
+    width: 100%;
+    .border-radius(@box-inner-border-radius @box-inner-border-radius 0 0);
+  }
+
   .actions {
-    border-right: 1px #000000 solid;
     float: right;
     list-style: none;
-    margin: -1px -1px 0 0;
+    margin: 0;
     padding: 0;
     white-space: nowrap;
 
@@ -201,8 +212,10 @@
       color: black;
       cursor: pointer;
       display: block;
-      padding: 4px 8px;
       text-decoration: none;
+      padding: 4px 8px;
+
+      border-left: 1px @review-request-action-border-color solid;
     }
 
     img {
@@ -210,69 +223,81 @@
     }
 
     li {
-      background: #dfb16a url("../images/review_request_action_bg.png") repeat-x top left;
-      border: 1px black solid;
-      border-right: 0;
       float: left;
+      margin: 0;
+      padding: 0;
 
-      &:active {
-        background-color: #e8c894;
-        background-image: url("../images/review_request_action_bg_clicked.png");
+      &:hover {
+        background-color: @review-request-action-hover-bg;
       }
 
-      &:hover {
-        background-color: #e8c896;
-        background-image: url("../images/review_request_action_bg_hover.png");
+      &:active {
+        background-color: @review-request-action-active-bg;
       }
 
       &.primary {
-        background-color: #e7c591;
-        background-image: url("../images/review_request_action_primary_bg.png");
+        background-color: @review-request-action-primary-bg;
       }
 
       &.primary:hover {
-        background-color: #eed6b1;
-        background-image: url("../images/review_request_action_primary_bg_hover.png");
+        background-color: @review-request-action-primary-hover-bg;
       }
 
       &.primary:active {
-        background-color: #eed6af;
-        background-image: url("../images/review_request_action_primary_bg_clicked.png");
+        background-color: @review-request-action-primary-active-bg;
       }
     }
 
+    .menu-title {
+      background: url("../images/dropdown.png") no-repeat 100% 60%;
+      margin-right: 0.6em;
+      padding-right: 1.2em;
+    }
+
     .menu {
-      background: #dfb16a url("../images/review_request_action_bg.png") repeat-x top left;
-      border: 1px black solid;
+      background: @review-request-action-menu-bg;
+      border: 1px @review-request-action-menu-border-color solid;
+      float: none;
       list-style: none;
       margin: 0;
       padding: 0;
       position: absolute;
+      z-index: 100;
+      .border-radius(0 0 @box-border-radius @box-border-radius);
+      .box-shadow(@box-shadow);
 
       li {
-        background: none;
+        background: @review-request-action-bg;
         border: 0;
         float: none;
         margin: 0;
         padding: 0;
 
+        &:last-child a {
+          .border-radius(0 0 @box-border-radius @box-border-radius);
+        }
+
+        &:hover {
+          background-color: @review-request-action-menu-item-hover-bg;
+        }
+
         a {
           color: black;
+          border: 0;
           display: block;
           margin: 0;
           padding: 5px 10px;
           text-decoration: none;
-
-          &:hover {
-            background-color: #c79343;
-          }
         }
       }
     }
   }
 
-  .actions>li:first-child {
-    .border-radius(0 0 0 8px);
+  .actions>li {
+    &:last-child a {
+      border-right: 0;
+      .border-radius(0 @box-inner-border-radius 0 0);
+    }
   }
 
   #updated_time, #created_time {
@@ -512,6 +537,7 @@
     position: relative;
     width: 4.5em;
     top: -8px;
+    .border-radius(@box-border-radius 0 @box-border-radius 0);
   }
 }
 
@@ -668,14 +694,24 @@
   height: 13em;
   position: relative;
   margin: 0 2em 2em 0;
-  .border-radius(0 0 8px 8px);
+  .border-radius(@box-border-radius);
+
+  .actions {
+    li {
+      a {
+        .border-radius(0 @box-inner-border-radius 0 @box-inner-border-radius);
+        border-left: 1px @review-request-action-border-color solid;
+        border-bottom: 1px @review-request-action-border-color solid;
+      }
+    }
+  }
 
   .file-header {
     background: white;
     padding: 0.5em 10em 0.5em 0.5em;
     line-height: 2.5em;
-    -width: 30em;
     white-space: nowrap;
+    .border-radius(@box-border-radius @box-border-radius 0 0);
 
     a {
       color: blue;
@@ -734,7 +770,7 @@
   border: 1px #999999 solid;
   border-top: 1px #CCCCCC solid;
   padding: 2px 8px;
-  .border-radius(0 0 8px 8px);
+  .border-radius(0 0 @box-border-radius @box-border-radius);
 
   img {
     vertical-align: bottom;
@@ -752,6 +788,7 @@
   text-align: center;
   vertical-align: middle;
   position: relative;
+  .border-radius(@box-border-radius);
 
   &:hover {
     background-color: #F6F6F6;
@@ -774,6 +811,7 @@
     line-height: 100px;
     margin: 0 auto;
     vertical-align: bottom;
+    .border-radius(@box-border-radius @box-border-radius 0 0);
 
     &.loading {
       background: white url("../images/spinner.gif") no-repeat center center;
@@ -781,6 +819,7 @@
 
     img {
       vertical-align: middle;
+      .border-radius(@box-inner-border-radius @box-inner-border-radius 0 0);
     }
   }
 }
@@ -936,6 +975,8 @@
   }
 
   h1 {
+    background: transparent;
+    border: 0;
     margin: 0 0 6px 0;
     padding: 0;
   }
@@ -1083,10 +1124,17 @@
 #submitted-banner {
   background: #E0E0E0;
   border: 1px #808080 solid;
+  .border-radius(@box-border-radius);
+  .box-shadow(@box-shadow);
+}
+
+#draft-banner {
+  .border-radius(@box-border-radius);
+  .box-shadow(@box-shadow);
 }
 
 #review-banner {
-  padding-bottom: 4.5em;
+  padding-bottom: 4em;
 
   .banner {
     border-left: 0;
@@ -1097,6 +1145,7 @@
     top: 0;
     width: 100%;
     z-index: 1000;
+    .box-shadow(@box-shadow);
   }
 }
 
diff --git a/reviewboard/static/rb/images/review_request_action_bg.png b/reviewboard/static/rb/images/review_request_action_bg.png
deleted file mode 100644
index 414659a800ad1a6e1a4374c76d420099dc129c2f..0000000000000000000000000000000000000000
diff --git a/reviewboard/static/rb/images/review_request_action_bg_clicked.png b/reviewboard/static/rb/images/review_request_action_bg_clicked.png
deleted file mode 100644
index 74ff75274ede8c22d9b9a5edf3eb1b520f9fffb8..0000000000000000000000000000000000000000
diff --git a/reviewboard/static/rb/images/review_request_action_bg_hover.png b/reviewboard/static/rb/images/review_request_action_bg_hover.png
deleted file mode 100644
index f209a244619806b0f92b0b3f93e20e1811d03efa..0000000000000000000000000000000000000000
diff --git a/reviewboard/static/rb/images/review_request_action_primary_bg.png b/reviewboard/static/rb/images/review_request_action_primary_bg.png
deleted file mode 100644
index 5fce841f3efc569c359ff0b5c9e43414e3b46f07..0000000000000000000000000000000000000000
diff --git a/reviewboard/static/rb/images/review_request_action_primary_bg_clicked.png b/reviewboard/static/rb/images/review_request_action_primary_bg_clicked.png
deleted file mode 100644
index c85972f2a3bfdcb6ab5ad9bf22537bad8450b202..0000000000000000000000000000000000000000
diff --git a/reviewboard/static/rb/images/review_request_action_primary_bg_hover.png b/reviewboard/static/rb/images/review_request_action_primary_bg_hover.png
deleted file mode 100644
index c6363756a5c53f027c844d4465a250a3a1c9a354..0000000000000000000000000000000000000000
diff --git a/reviewboard/templates/base.html b/reviewboard/templates/base.html
index ba348b96574f4e20c3042a115591e12c5d394733..cd7b442483fe5139d9246f730969baca20a8b9e0 100644
--- a/reviewboard/templates/base.html
+++ b/reviewboard/templates/base.html
@@ -4,6 +4,7 @@
 {% load djblets_deco %}
 {% load djblets_extensions %}
 {% load djblets_utils %}
+{% load gravatars %}
 {% load i18n %}
 {% load rb_extensions %}
 {% load staticfiles %}
@@ -65,58 +66,65 @@
   <div id="container">
 {% block headerbar %}
    <div id="headerbar">
+{% include "base/branding.html" %}
     <ul id="accountnav">
+     <li>
+      <a href="#">Support</a>
+      <ul>
+       <li><a href="http://www.reviewboard.org/docs/manual/dev/">{% trans "Documentation" %}</a></li>
+       <li><a href="http://www.reviewboard.org/bugs/">{% trans "Bugs" %}</a></li>
+       <li><a href="http://www.reviewboard.org/bugs/new/">{% trans "Report bug" %}</a></li>
+      </ul>
+     </li>
 {% if user.is_authenticated %}
-{%  blocktrans with user|realname|escape as username %}
-     <li>Welcome, <b>{{username}}</b></li>
-{% endblocktrans %}
-     <li>- <a href="{% url user-preferences %}">{% trans "My account" %}</a></li>
+     <li>
+      <a class="user-nav-item" href="{% url user-preferences %}">{% gravatar user 32 %} {{user.first_name}}</a>
+      <ul>
+       <li><a href="{% url user-preferences %}">{% trans "My account" %}</a></li>
 {%  if user.is_staff %}
-     <li>- <a href="{% url reviewboard.admin.views.dashboard %}">{% trans "Admin" %}</a></li>
+       <li><a href="{% url reviewboard.admin.views.dashboard %}">{% trans "Admin" %}</a></li>
 {%  endif %}
-     <li>- <a href="{% url logout %}">{% trans "Log out" %}</a></li>
+       <li><a href="{% url logout %}">{% trans "Log out" %}</a></li>
+      </ul>
+     </li>
 {% else %}
      <li><a href="{% url login %}?next_page={{request.path}}">{% trans "Log in" %}</a></li>
 {#  XXX Using default sucks, but siteconfig defaults don't #}
 {#      work from templates.                               #}
 {%  if auth_backends.0.supports_registration and siteconfig.settings.auth_enable_registration|default_if_none:1 %}
-     <li>- <a href="{% url register %}">{% trans "Register" %}</a></li>
+     <li><a href="{% url register %}">{% trans "Register" %}</a></li>
 {%  endif %}
 {% endif %}{# !is_authenticated #}
-     <li>- <a href="http://www.reviewboard.org/docs/manual/dev/">{% trans "Documentation" %}</a></li>
-     <li>- <a href="http://www.reviewboard.org/bugs/">{% trans "Bugs" %}</a></li>
-     <li>- <a href="http://www.reviewboard.org/bugs/new/">{% trans "Report bug" %}</a></li>
     </ul>
+    <div id="search">
+{% if siteconfig.settings.search_enable %}
+    <form method="get" action="{% url search %}">
+{% endif %}
+     <input type="text" name="q" placeholder="{% if siteconfig.settings.search_enable %}{% trans "Search" %}{% else %}{% trans "Jump to..." %}{% endif %}" id="search_field" {% attr "value" %}{{query}}{% endattr %} />
+{% if siteconfig.settings.search_enable %}
+    </form>
+{% endif %}
+    </div>
+
     <br />
-   {% include "base/branding.html" %}
    </div>
-   <div id="page-container">
 {% template_hook_point "base-before-navbar" %}
+
 {% block navbar %}
-   {% if user.is_authenticated or not siteconfig.settings.auth_require_sitewide_login %}
-    {% if siteconfig.settings.search_enable %}<form method="get" action="{% url search %}">{% endif %}
-     <div id="navbar-outer">
-      <ul id="navbar">
-{% if user.is_authenticated %}
-       <li><a href="{% url dashboard %}">{% trans "My Dashboard" %}</a></li>
-       <li><a href="{% url new-review-request %}">{% trans "New Review Request" %}</a></li>
-       <li>-</li>
-{% endif %}
-       <li><a href="{% url all-review-requests %}">{% trans "All review requests" %}</a></li>
-       <li><a href="{% url all-groups %}">{% trans "Groups" %}</a></li>
-       <li><a href="{% url all-users %}">{% trans "Submitters" %}</a></li>
-{% navigation_bar_hooks %}
-       <li id="searchbar">
-       <input type="text" name="q" id="search_field" {% attr "value" %}{{query}}{% endattr %} />
-       {% if siteconfig.settings.search_enable %}
-        <input type="submit" value="{% trans "Search" %}" />
-       {% endif %}
-       </li>
-      </ul>
-     </div>
-     {% if siteconfig.settings.search_enable %}</form>{% endif %}
-    {% endif %}
+   <ul id="navbar">
+{%  if user.is_authenticated or not siteconfig.settings.auth_require_sitewide_login %}
+{%   if user.is_authenticated %}
+    <li><a href="{% url dashboard %}">{% trans "My Dashboard" %}</a></li>
+    <li><a href="{% url new-review-request %}">{% trans "New Review Request" %}</a></li>
+{%   endif %}
+    <li><a href="{% url all-review-requests %}">{% trans "All review requests" %}</a></li>
+    <li><a href="{% url all-groups %}">{% trans "Groups" %}</a></li>
+    <li><a href="{% url all-users %}">{% trans "Submitters" %}</a></li>
+{%   navigation_bar_hooks %}
+{%  endif %}
+   </ul>
 {% endblock %}
+   <div id="page-container">
 {% endblock %}
     <noscript>
 {%  box "important" %}
diff --git a/reviewboard/templates/diffviewer/view_diff.html b/reviewboard/templates/diffviewer/view_diff.html
index d670d3893acb69ed7091ce8f709daa75c09878ee..89c5246fbaaa2d800788a9883589a22f13d6f27d 100644
--- a/reviewboard/templates/diffviewer/view_diff.html
+++ b/reviewboard/templates/diffviewer/view_diff.html
@@ -58,15 +58,18 @@
 {% include "reviews/review_header.html" %}
 
 {% box "review-request" %}
-<ul class="actions">
+<div class="actions-container">
+ <ul class="actions">
 {% include "reviews/review_request_actions_secondary.html" %}
 {% diffviewer_action_hooks %}
 {% if not interdiffset %}
- <li class="primary"><a href="raw/">{% trans "Download Diff" %}</a></li>
+  <li class="primary"><a href="raw/">{% trans "Download Diff" %}</a></li>
 {% endif %}
 {% include "reviews/review_request_actions_primary.html" %}
- <li class="primary"><a href="{{review_request.get_absolute_url}}">{% trans "View Reviews" %}</a></li>
-</ul>
+  <li class="primary"><a href="{{review_request.get_absolute_url}}">{% trans "View Reviews" %}</a></li>
+ </ul>
+</div>
+
 <div class="main">
 {% include "reviews/review_request_box.html" %}
 
diff --git a/reviewboard/templates/reviews/review_detail.html b/reviewboard/templates/reviews/review_detail.html
index 6fcfc7dbb232306a9464488afd09bcea134fa022..a68ab6528bc97a0de88af7440a2e5514f07ef17e 100644
--- a/reviewboard/templates/reviews/review_detail.html
+++ b/reviewboard/templates/reviews/review_detail.html
@@ -31,18 +31,20 @@
 
 {% box "review-request" %}
 
-<ul class="actions">
+<div class="actions-container">
+ <ul class="actions">
 {% review_request_action_hooks %}
 {% review_request_dropdown_action_hooks %}
 {% include "reviews/review_request_actions_secondary.html" %}
 {% if has_diffs %}
- <li class="primary"><a href="diff/raw/">{% trans "Download Diff" %}</a></li>
+  <li class="primary"><a href="diff/raw/">{% trans "Download Diff" %}</a></li>
 {% endif %}
 {% include "reviews/review_request_actions_primary.html" %}
 {% if has_diffs %}
- <li class="primary"><a href="diff/#index_header">{% trans "View Diff" %}</a></li>
+  <li class="primary"><a href="diff/#index_header">{% trans "View Diff" %}</a></li>
 {% endif %}
-</ul>
+ </ul>
+</div>
 
 <div class="main">
 {% include "reviews/review_request_box.html" %}
diff --git a/reviewboard/templates/reviews/review_request_actions_secondary.html b/reviewboard/templates/reviews/review_request_actions_secondary.html
index f3612f32aec1de9d6588fba969491ea0ba9fea29..e9b6769fab8b6b577babf10c501862ef3b87b73e 100644
--- a/reviewboard/templates/reviews/review_request_actions_secondary.html
+++ b/reviewboard/templates/reviews/review_request_actions_secondary.html
@@ -5,7 +5,7 @@
 {% if request.user.pk == review_request.submitter_id or perms.reviews.can_change_status and review_request.public %}
 {%  if review_request.status == 'P' %}
  <li>
-  <a id="close-review-request-link" href="#">{% trans "Close" %} <img src="{% static "rb/images/dropdown.png" %}" width="7" height="5" border="0" alt="" /></a>
+  <a class="menu-title" id="close-review-request-link" href="#">{% trans "Close" %}</a>
   <ul class="menu" style="display: none;">
    <li><a id="link-review-request-close-submitted" href="#">{% trans "Submitted" %}</a></li>
    <li><a id="discard-review-request-link" href="#">{% trans "Discarded" %}</a></li>
@@ -17,9 +17,14 @@
 {%  endif %}
 {% endif %}
 {% if request.user.pk == review_request.submitter_id or perms.reviews.can_edit_reviewrequest %}
- <li><a id="upload-screenshot-link" href="#">{% trans "Add Screenshot" %}</a></li>
- <li><a id="upload-file-link" href="#">{% trans "Add File" %}</a></li>
+ <li>
+  <a class="menu-title" id="update-review-request-link" href="#">{% trans "Update" %}</a>
+  <ul class="menu" style="display: none;">
 {%  if upload_diff_form %}
- <li><a id="upload-diff-link" href="#">{% if has_diffs %}{% trans "Update Diff" %}{% else %}{% trans "Upload Diff" %}{% endif %}</a></li>
+   <li><a id="upload-diff-link" href="#">{% if has_diffs %}{% trans "Update Diff" %}{% else %}{% trans "Upload Diff" %}{% endif %}</a></li>
 {%  endif %}
+   <li><a id="upload-file-link" href="#">{% trans "Add File" %}</a></li>
+   <li><a id="upload-screenshot-link" href="#">{% trans "Add Screenshot" %}</a></li>
+  </ul>
+ </li>
 {% endif %}
diff --git a/reviewboard/templates/reviews/screenshot_detail.html b/reviewboard/templates/reviews/screenshot_detail.html
index e1d8db8a34b12c171dea99c6b37141c6a072a5c7..ef9a494b0cef0d80c3c9968def6d5c3ce60ebf07 100644
--- a/reviewboard/templates/reviews/screenshot_detail.html
+++ b/reviewboard/templates/reviews/screenshot_detail.html
@@ -25,16 +25,17 @@
 
 {% block content %}
 {% box "review-request"%}
+<div class="actions-container">
  <ul class="actions">
 {% include "reviews/review_request_actions_secondary.html" %}
- <li class="primary"><a href="diff/raw/">{% trans "Download Diff" %}</a></li>
+  <li class="primary"><a href="diff/raw/">{% trans "Download Diff" %}</a></li>
 {% include "reviews/review_request_actions_primary.html" %}
   <li class="primary"><a href="{{review_request.get_absolute_url}}">{% trans "View Reviews" %}</a></li>
 {% if has_diffs %}
- <li class="primary"><a href="{{review_request.get_absolute_url}}diff/#index_header">{% trans "View Diff" %}</a></li>
+  <li class="primary"><a href="{{review_request.get_absolute_url}}diff/#index_header">{% trans "View Diff" %}</a></li>
 {% endif %}
  </ul>
-
+</div>
 {% include "reviews/review_request_dlgs.html" %}
 
  <div class="main">