[PATCH conductor] Administer and Monitor sections unifications

jtomasek at redhat.com jtomasek at redhat.com
Thu Apr 19 11:58:11 UTC 2012


From: Jiri Tomasek <jtomasek at redhat.com>

fixed header nav highlighting

scorecard fixup

unified content

removed unused masthead css, unified user-menu into header.scss

footer fixup

header.shell-design fixup

page-header fixups

header.page-header fixup

removed corner, started to unify admin-page-header and page-header

removed admin-page-header and unified it to page-header

content-section fixup

unified content-section

removed primary navigation styling

forms unification, horizontal form

form inputs to be contained in .field instead of p

removed body classes and fixed provider_select
---
 src/app/stylesheets/custom.scss                    |   79 --
 src/app/stylesheets/header.scss                    |   74 +--
 src/app/stylesheets/layout.scss                    |  848 +++-----------------
 src/app/views/catalogs/_form.html.haml             |   10 +-
 src/app/views/catalogs/_section_header.html.haml   |    4 +-
 src/app/views/catalogs/edit.html.haml              |    8 +-
 src/app/views/catalogs/new.html.haml               |    8 +-
 src/app/views/catalogs/show.html.haml              |    8 +-
 .../views/config_servers/_config_server_form.haml  |   15 +-
 src/app/views/config_servers/_section_header.haml  |    4 +-
 src/app/views/config_servers/edit.haml             |    2 +-
 src/app/views/config_servers/new.haml              |    4 +-
 src/app/views/deployables/_form.html.haml          |   36 +-
 src/app/views/deployables/_from_url.html.haml      |   41 +-
 src/app/views/deployables/_list.html.haml          |    2 +-
 src/app/views/deployables/_new.html.haml           |    2 +-
 .../views/deployables/_new_from_image.html.haml    |   58 +-
 .../views/deployables/_section_header.html.haml    |    4 +-
 src/app/views/deployables/_upload.html.haml        |   41 +-
 src/app/views/deployables/edit.html.haml           |    8 +-
 src/app/views/deployables/show.html.haml           |   12 +-
 src/app/views/deployments/_header_show.html.haml   |    5 +-
 src/app/views/deployments/_launch_new.html.haml    |   11 +-
 src/app/views/deployments/_overview.html.haml      |   75 +-
 .../views/deployments/confirm_terminate.html.haml  |    3 +-
 .../deployments/launch_from_catalog.html.haml      |    6 +-
 .../views/deployments/launch_time_params.html.haml |    1 -
 .../hardware_profiles/_section_header.html.haml    |    4 +-
 src/app/views/hardware_profiles/edit.html.haml     |    6 +-
 src/app/views/hardware_profiles/new.html.haml      |    7 +-
 src/app/views/hardware_profiles/show.html.haml     |    8 +-
 src/app/views/images/edit_xml.html.haml            |   14 +-
 src/app/views/images/import.html.haml              |   27 +-
 src/app/views/images/new.html.haml                 |   48 +-
 src/app/views/images/overview.html.haml            |    6 +-
 src/app/views/images/show.html.haml                |    8 +-
 .../views/instances/confirm_terminate.html.haml    |    3 +-
 src/app/views/instances/show.html.haml             |    4 +-
 .../views/layouts/_admin_content_tabs.html.haml    |    2 +-
 .../layouts/_admin_environments_tabs.html.haml     |    3 +-
 src/app/views/layouts/_admin_users_tabs.html.haml  |    2 +-
 src/app/views/layouts/application.html.haml        |   42 +-
 src/app/views/permissions/_new.html.haml           |    6 +-
 src/app/views/pool_families/_form.html.haml        |   16 +-
 .../views/pool_families/_section_header.html.haml  |    3 +-
 .../pool_families/add_provider_accounts.html.haml  |    6 +-
 src/app/views/pool_families/edit.html.haml         |    8 +-
 src/app/views/pool_families/new.html.haml          |    8 +-
 src/app/views/pool_families/show.html.haml         |    6 +-
 src/app/views/pools/_edit.html.haml                |    3 +-
 src/app/views/pools/_form.html.haml                |   15 +-
 src/app/views/pools/_header_index.html.haml        |    3 +-
 src/app/views/pools/_header_show.html.haml         |    7 +-
 src/app/views/pools/_pretty_list.html.haml         |    3 +-
 src/app/views/pools/_section_header.html.haml      |    4 +-
 .../provider_accounts/_provider_form.html.haml     |   42 +-
 .../_provider_selection.html.haml                  |   18 +-
 .../provider_accounts/_section_header.html.haml    |    3 +-
 src/app/views/provider_accounts/edit.html.haml     |   13 +-
 src/app/views/provider_accounts/new.html.haml      |   10 +-
 src/app/views/provider_accounts/show.html.haml     |   10 +-
 .../provider_realms/_section_header.html.haml      |    4 +-
 src/app/views/provider_realms/show.html.haml       |   11 +-
 src/app/views/providers/_edit.html.haml            |    4 +-
 src/app/views/providers/_form.html.haml            |   34 +-
 .../providers/_provider_availability.html.haml     |    2 +-
 src/app/views/providers/_section_header.html.haml  |    6 +-
 .../views/providers/confirm_terminate.html.haml    |    2 +-
 src/app/views/providers/edit.html.haml             |    9 +-
 src/app/views/providers/index.html.haml            |    2 +-
 src/app/views/providers/new.html.haml              |    8 +-
 src/app/views/providers/show.html.haml             |    2 +-
 src/app/views/realm_mappings/new.html.haml         |    9 +-
 src/app/views/realms/_form.html.haml               |   14 +-
 src/app/views/realms/_section_header.html.haml     |    4 +-
 src/app/views/realms/edit.html.haml                |    8 +-
 src/app/views/realms/new.html.haml                 |    8 +-
 src/app/views/realms/show.html.haml                |    8 +-
 src/app/views/roles/_list.html.haml                |    2 +-
 src/app/views/roles/_section_header.html.haml      |    4 +-
 src/app/views/roles/edit.html.haml                 |    8 +-
 src/app/views/roles/new.html.haml                  |    4 +-
 src/app/views/roles/show.html.haml                 |    6 +-
 src/app/views/settings/_section_header.html.haml   |    5 +-
 src/app/views/settings/index.html.haml             |    2 +-
 src/app/views/settings/self_service.html.haml      |   14 +-
 src/app/views/users/_form.html.haml                |   50 +-
 src/app/views/users/_section_header.html.haml      |    5 +-
 src/app/views/users/edit.html.haml                 |   14 +-
 src/app/views/users/new.html.haml                  |    8 +-
 src/app/views/users/show.html.haml                 |    8 +-
 src/config/locales/en.yml                          |    1 +
 src/public/images/administer_nav_bg.png            |  Bin 2008 -> 0 bytes
 93 files changed, 667 insertions(+), 1336 deletions(-)
 delete mode 100644 src/public/images/administer_nav_bg.png

diff --git a/src/app/stylesheets/custom.scss b/src/app/stylesheets/custom.scss
index 84b4c40..93b85c0 100644
--- a/src/app/stylesheets/custom.scss
+++ b/src/app/stylesheets/custom.scss
@@ -5,85 +5,6 @@
   border-radius: 0em 50em 50em 0em;
 }
 
-.deployable_details {
-  color: #606060;
-  position: relative;
-  width: 500px;
-  margin: auto;
-  background: url(../../images/launch-deployment-icon.png) no-repeat right 75%;
-
-  header.confirmation {
-    background-image: none;
-    margin-bottom: 3em;
-
-    h2 {
-      width: 400px;
-      font-size: 28px;
-      font-weight: normal;
-      text-align: center;
-      margin-left: 50px;
-      margin-right: 50px;
-    }
-    p {
-      text-align: center;
-      font-size: 13px;
-      margin-left: 50px;
-      margin-right: 50px;
-      word-wrap: break-word;
-    }
-  }
-
-  h3 {
-    margin-top: 1em;
-  }
-
-  .content {
-    max-width: 280px;
-
-    li {
-      list-style-type: none;
-      margin-top: 4px;
-    }
-    input[type="text"] {
-      padding: 4px;
-      width: 200px;
-      font-size: 13px;
-      border: 1px solid #c4c4c4;
-      box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5);
-      -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5);
-      -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.5);
-    }
-  }
-
-  .image-id {
-    font-family: Inconsolata, Consolas, Monaco, 'Lucida Console', 'Liberation Mono', 'DejaVu Sans Mono', monospace;
-    font-size: 11px;
-  }
-
-}
-
-#deployable-xml-link {
-  color: #666;
-}
-
-#action-buttons {
-  margin: auto;
-  width: 300px;
-  margin-top: 3em;
-  margin-bottom: 3em;
-}
-
-#launch_deployment {
-  background: url(../../images/launch-button.png) no-repeat center;
-  width: 147px;
-  height: 54px;
-
-  // Hide the text visually but keep it available for screen readers and such
-  text-indent: -3000px;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
 .pool_details {
   color: #333;
   text-decoration: none;
diff --git a/src/app/stylesheets/header.scss b/src/app/stylesheets/header.scss
index e0daa4d..dca6cc2 100644
--- a/src/app/stylesheets/header.scss
+++ b/src/app/stylesheets/header.scss
@@ -51,10 +51,10 @@
 /* Some header-specific styling */
 
 header.shell-design {
+  height: 5.5em;
   background-color: #1a1f22;
   position: relative;
   color: #fff;
-  height: 6.25em;
   border-bottom: .4em solid #060807;
   border-top: .4em solid #060807;
   box-shadow: inset 0em -0.1em #181c1e, inset 0px -2em 5em #101214;
@@ -73,6 +73,8 @@ header.shell-design {
       margin-left: .25em;
       font-style: normal; } }
   > article {
+    margin: 0 auto;
+    max-width: 80em;
     line-height: 2em;
     position: relative;
     padding: 0em;
@@ -106,7 +108,9 @@ nav#appnav {
         position: relative;
         white-space: nowrap;
         overflow: hidden;
-        text-overflow: ellipsis; }
+        text-overflow: ellipsis;
+        &.selected{ background-color: #444; }
+      }
       > a {
         color: #bbb;
         padding: .75em 1em;
@@ -189,8 +193,14 @@ nav#appnav {
   border: 1px solid #ccc;
   margin: -0.1px; }
 
-header {
+header.shell-design {
   nav#appnav > ul > li {
+    &:hover > ul {
+      z-index: 9999 !important;
+      /*painfully silly hack*/
+      margin-top: -0.25em;
+      padding-top: 0em !important;
+    }
     > ul > li:hover {
       position: relative; }
     &:hover > ul > li > ul {
@@ -402,38 +412,21 @@ header {
 
 /* Wait, do we actually want this? */
 
-/* Fix up the user dropdown menu  */
-
-body {
-  #primary-container #content {
-    /*box-shadow*/
-    -webkit-box-shadow: 0px .5em 3em #777 !important;
-    -moz-box-shadow: 0px .5em 3em #777 !important;
-    box-shadow: 0px .5em 3em #777 !important; }
-  &.administer nav#administer_nav {
-    /*box-shadow*/
-    -webkit-box-shadow: inset 0em -1em 2em rgba(0, 0, 0, 0.05), 1px 1px 0px #cccccc, -1px 1px 0px #cccccc !important;
-    -moz-box-shadow: inset 0em -1em 2em rgba(0, 0, 0, 0.05), 1px 1px 0px #cccccc, -1px 1px 0px #cccccc !important;
-    box-shadow: inset 0em -1em 2em rgba(0, 0, 0, 0.05), 1px 1px 0px #cccccc, -1px 1px 0px #cccccc !important; } }
+/* User dropdown menu definition  */
 
 section#usermenu {
-  background-image: none !important;
   position: absolute;
-  left: 80.5%;
-  background-color: transparent !important;
-  border-color: transparent;
-  border-radius: 0 !important;
+  left: 80%;
   width: 20%;
+  padding: 5px 2px 5px 2px;
+  cursor: pointer;
   z-index: 9999;
   > a {
-    background-image: none !important;
-    background-color: transparent;
-    color: #fff !important;
     width: 100%; }
   > ul {
+    list-style-type: none;
     display: none;
     border: none;
-    background-color: transparent !important;
     padding: 0em;
     margin: 0em;
     top: 4em;
@@ -446,9 +439,7 @@ section#usermenu {
       content: none; } }
   &:hover > ul {
     display: block;
-    border-color: transparent !important;
-    background-image: none !important;
-    box-shadow: none !important; }
+  }
   > ul {
     > li {
       padding: 0em;
@@ -470,30 +461,3 @@ section#usermenu {
         border-radius: 0em 0em .51em .51em; }
       a:after {
         content: none; } } } }
-
-/* Fix up footer */
-
-footer.standard {
-  div {
-    &.container {
-      background-color: transparent;
-      color: #333 !important;
-      text-align: center !important;
-      display: block;
-      width: 100%;
-      float: none !important;
-      position: relative; }
-    background-color: transparent;
-    color: #333 !important;
-    text-align: center !important;
-    display: block;
-    width: 100%;
-    float: none !important;
-    position: relative; }
-  background-color: transparent;
-  color: #333 !important;
-  text-align: center !important;
-  display: block;
-  width: 100%;
-  float: none !important;
-  position: relative; }
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index 8529361..430ee1b 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -132,11 +132,6 @@ xmp {
 
 h1,h2,h3,h4,h5,h6{ word-wrap: break-word; }
 
-html,
-body {
-  height: 100%;
-}
-
 article,
 aside,
 details,
@@ -269,8 +264,6 @@ $font-family-primary: Helvetica, Arial, "Lucida Grande", sans-serif;
 
 /* body */
 
-html, body{ height: 100%; }
-
 body{
   background: url('../../images/body-bg.png');
   font-family: $font-family-base;
@@ -286,36 +279,24 @@ strong, em, b, i{ font-family: $font-family-em; }
 
 /* Content */
 
-$monitorcontentpadding: 7px;
-$administercontentpadding: 0px 0px 0px 0px;
-
-body.monitor div#content{
-  width: $width - (2 * $monitorcontentpadding);
-  padding: $monitorcontentpadding;
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.50);
-  -moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
-  -webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
-}
-body.administer div#content{
-  width: $width;
-  padding: $administercontentpadding;
-}
-
 div#content{
+  width: $width;
   margin: 0 auto;
   margin-bottom: 58px;
   min-height: 200px;
-  -webkit-border-radius: 7px; -moz-border-radius: 7px; border-radius: 7px;
+  border: 1px solid #eee;
+  border-top: transparent none 0px;
+  /*border-radius*/
+  -webkit-border-radius: 0em 0em .5em .5em;
+  -moz-border-radius: 0em 0em .5em .5em;
+  border-radius: 0em 0em .5em .5em;
   background-color: #FAFAFA;
-  border: 1px solid #999;
   position: relative;
   z-index: 100;
-
-  div.header{
-    background-color: #ccc;
-    height: 60px;
-  }
-
+  /*box-shadow*/
+  -webkit-box-shadow: inset 0px .25em .25em #aaa, 0px .5em 2em #000 !important;
+  -moz-box-shadow: inset 0px .25em .25em #aaa, 0px .5em 2em #000 !important;
+  box-shadow: inset 0px .25em .25em #aaa, 0px .5em 2em #000 !important;
 }
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -884,113 +865,6 @@ $font-family-primary: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-
 }
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-App Masthead -- v.0.0.2 [masthead] (masthead.scss)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-header#masthead{
-  height: 49px;
-  background-color: #E7E7E7;
-  background: url('../../images/masthead-bg.png') repeat-x;
-  position: relative;
-
-  img#logo{
-    position: absolute;
-    top: 8px;
-  }
-
-  div.container{
-    margin: 0 auto;
-    width: 960px;
-  }
-
-  nav#system{
-    float:right;
-    margin-top: 8px;
-    & > ul{
-      list-style: none;
-      & > li{ @include display_inline_block; vertical-align: middle; }
-      & > li{ margin-left: 8px; }
-      & > li.separator{
-        background: url('../../images/masthead-nav-separator.gif') no-repeat left top;
-        padding: 8px 1px 8px 1px;
-      }
-    }
-  }
-
-}
-
-
-section#usermenu{
-  border: 1px solid #ccc;
-  background: #e7e7e7 url('../../images/button-userdrop.png') no-repeat center 4px;
-  width: 46px;
-  left: 8px;
-  margin: 0px 8px 0px 0px;
-  color: transparent;
-  font-size: 12px; /* match the font-size of the query box, for proper valign */
-  padding: 5px 2px 5px 2px;
-  -webkit-border-radius: 50em;
-  -moz-border-radius: 50em;
-  border-radius: 50em;
-  position: relative;
-  z-index: 3;
-  cursor: pointer;
-  &:hover{
-    border-bottom: none;
-    -webkit-border-radius: 1em 1em 0px 0px;
-    -moz-border-radius: 1em 1em 0px 0px;
-    border-radius: 1em 1em 0px 0px;
-    height: 16px;
-    box-shadow: 0 7px 7px rgba(0, 0, 0, 0.50);
-    -moz-box-shadow: 0 7px 7px rgba(0, 0, 0, 0.50);
-    -webkit-box-shadow: 0 7px 7px rgba(0, 0, 0, 0.50);
-
-    ul#user-menu{ display: block !important; }
-  }
-}
-
-
-ul#user-menu {
-  position: absolute;
-  /*display: none;*/
-  top: 26px;
-  right: -1px;
-  width: 130px;
-  background: #e7e7e7;
-  //padding: 8px 12px;
-  -webkit-border-radius: 7px 0px 7px 7px;
-  -moz-border-radius: 7px 0px 7px 7px;
-  border-radius: 7px 0px 7px 7px;
-  box-shadow: 0 7px 7px rgba(0, 0, 0, 0.50);
-  -moz-box-shadow: 0 7px 7px rgba(0, 0, 0, 0.50);
-  -webkit-box-shadow: 0 7px 7px rgba(0, 0, 0, 0.50);
-  li{
-    list-style-type: none;
-    width: 100%;
-    a{
-      padding: 7px 10px;
-      display: block;
-      text-decoration: none;
-    }
-    &:hover{
-      background:#C4E0F0;
-      &:first-child{ -webkit-border-radius: 4px 0px 0px 0px; -moz-border-radius: 4px 0px 0px 0px; border-radius: 4px 0px 0px 0px; }
-      &:last-child{ -webkit-border-radius: 0px 0px 4px 4px; -moz-border-radius: 0px 0px 4px 4px; border-radius: 0px 0px 4px 4px; }
-      &:only-child{ -webkit-border-radius: 4px 0px 4px 4px; -moz-border-radius: 4px 0px 4px 4px; border-radius: 4px 0px 4px 4px; }
-    }
-  }
-  &:before{
-    content: "";
-    position: absolute;
-    top: -1px;
-    right: 0px;
-    width: 50px;
-    height: 1px;
-    background: #e5e5e5;
-  }
-}
-
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Alert Flash -- v.0.0.1 [flash] (flash.scss)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
@@ -1046,88 +920,19 @@ Alert Flash -- v.0.0.1 [flash] (flash.scss)
 }
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Primary Tab Navigation -- v.0.0.2 [nav_primary] (nav_primary.scss)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-/* Primary Nav */
-$font-family-nav-primary: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
-
-
-nav#primary {
-  margin-top: 22px;
-
-  ul.container{
-    width: 950px;
-    margin: 0 auto;
-    list-style: none;
-    padding-left: 24px;
-    height: 34px;
-    li{
-      position: relative;
-      @include display_inline_block;
-      background: url('../../images/tab-inactive-right.png') no-repeat right top;
-      height: 34px;
-      margin-right: 6px;
-      z-index: 1;
-      &.selected{
-        z-index: 1000;
-        height: 43px;
-        a{
-          padding: 12px 20px 12px 20px;
-          font-size: 16px;
-          color: #666;
-        }
-      }
-      &.selected.monitor{
-        margin-top: -5px;
-        background: url('../../images/tab-active-right.png') no-repeat right top;
-        a{
-          background:url('../../images/tab-active-left.png') no-repeat left top;
-        }
-      }
-      &.selected.administer{
-        margin-top: -6px;
-        background: url('../../images/administer-tab-active-right.png') no-repeat right top;
-        a{
-          background:url('../../images/administer-tab-active-left.png') no-repeat left top;
-        }
-      }
-
-      a{
-        display: block;
-        background:url('../../images/tab-inactive-left.png') no-repeat left top;
-        padding: 10px 16px 14px 16px;
-        margin-left: -11px;
-        font-family: $font-family-nav-primary;
-        font-size: 12px;
-        letter-spacing: 1px;
-        font-weight: normal;
-        text-transform: uppercase;
-        text-decoration: none;
-        font-weight: bold;
-        color: #fff;
-      }
-    }
-    li + li{
-      margin-right: 6px;
-    }
-  }
-}
-
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Administer section navigation-- v.0.0.2
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 nav#administer_nav {
-  background: transparent url(../../images/administer_nav_bg.png) left bottom repeat-x;
-  -webkit-border-radius: 7px 7px 0px 0px;
-  -moz-border-radius: 7px 7px 0px 0px;
-  border-radius: 7px 7px 0px 0px;
-  padding-top: 7px;
-  min-height: 71px;
+  background-color: #ddd;
+  height: 6.5em;
   position: relative;
   z-index: 3;
   text-align: center;
+  /*box-shadow*/
+  -webkit-box-shadow: inset 0em -1em 2em rgba(0, 0, 0, 0.05), 1px 1px 0px #cccccc, -1px 1px 0px #cccccc;
+  -moz-box-shadow: inset 0em -1em 2em rgba(0, 0, 0, 0.05), 1px 1px 0px #cccccc, -1px 1px 0px #cccccc;
+  box-shadow: inset 0em -1em 2em rgba(0, 0, 0, 0.05), 1px 1px 0px #cccccc, -1px 1px 0px #cccccc;
 
   ul{
     margin: 0 auto;
@@ -1153,7 +958,8 @@ nav#administer_nav {
       text-decoration: none;
       display: block;
       color: black;
-      padding: 45px 10px 12px 10px;
+      padding: 4em 2em 2em 2em;
+      cursor: pointer;
       position: relative;
       background: transparent url("../../images/admin_nav_icons.png") no-repeat;
       &.users{
@@ -1195,26 +1001,29 @@ div#content .page-header{
 
   display: block;
   background: #ccc;
-  height: 56px;
-  width: 952px;
+  width: $width - 12px;
   padding: 6px;
   position: relative;
-  z-index: 900;
-  background: transparent url('../../images/header_bg.png') repeat-x top center;
+  background: #ddd;
+  @include clearfix;
 
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.40);
-  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.40);
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.40);
+  /*box-shadow*/
+  -webkit-box-shadow: inset 0em 0em 0em 1px rgba(0, 0, 0, 0.05), inset 0em 2px 0em rgba(255, 255, 255, 0.5), inset 0em -1em 2em rgba(0, 0, 0, 0.05), 0px 0.6em 0.5em -0.5em rgba(0, 0, 0, 0.3);
+  -moz-box-shadow: inset 0em 0em 0em 1px rgba(0, 0, 0, 0.05), inset 0em 2px 0em rgba(255, 255, 255, 0.5), inset 0em -1em 2em rgba(0, 0, 0, 0.05), 0px 0.6em 0.5em -0.5em rgba(0, 0, 0, 0.3);
+  box-shadow: inset 0em 0em 0em 1px rgba(0, 0, 0, 0.05), inset 0em 2px 0em rgba(255, 255, 255, 0.5), inset 0em -1em 2em rgba(0, 0, 0, 0.05), 0px 0.6em 0.5em -0.5em rgba(0, 0, 0, 0.3);
+  /*border-radius*/
+  -webkit-border-radius: 0em;
+  -moz-border-radius: 0em;
+  border-radius: 0em;
 
   h1{
-    font-family: $font-family-primary;
-    font-weight: 200;
+    font-family: overpass;
     font-size: 25px;
-    margin-top: 6px;
+    line-height: 38px;
+    font-weight: normal;
     color: #333;
-    text-shadow: 1px 1px 0 #fff;
-    @include display_inline_block;
-    padding: 6px 7px 7px 54px;
+    text-shadow: 0px 1px #eee;
+    padding: 7px 7px 7px 54px;
   }
 
   h1 span{
@@ -1227,7 +1036,6 @@ div#content .page-header{
 
   h1.pools{
     background: transparent url('../../images/header_icon_pools.png') no-repeat 8px center;
-    cursor: pointer;
   }
 
   h1.section-index{
@@ -1278,89 +1086,8 @@ div#content .page-header{
   }
 
   #obj_actions{
-    position: absolute;
-    right: 0px;
-    top: 22px;
-    @include display_inline_block;
-    margin-right: 24px;
-  }
-
-  .corner{
-    background: transparent url('../../images/header_corner.png') no-repeat top center;
-    width: 10px;
-    height: 10px;
-    position: absolute;
-    right: 0px;
-    bottom: -10px;
-    z-index: 1;
-  }
-
-  .button{
-    border-color: #fff;
-  }
-
-}
-
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Administer Page Header -- v.0.0.1
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-header.admin-page-header{
-  background: #e7e7e7; /* Old browsers */
-  background: -moz-linear-gradient(top, #e7e7e7 0%, #dadada 100%); /* FF3.6+ */
-  background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#e7e7e7), color-stop(100%,#dadada)); /* Chrome,Safari4+ */
-  background: -webkit-linear-gradient(top, #e7e7e7 0%,#dadada 100%); /* Chrome10+,Safari5.1+ */
-  background: -o-linear-gradient(top, #e7e7e7 0%,#dadada 100%); /* Opera11.10+ */
-  background: -ms-linear-gradient(top, #e7e7e7 0%,#dadada 100%); /* IE10+ */
-  background: linear-gradient(top, #e7e7e7 0%,#dadada 100%); /* W3C */
-
-  border-bottom: 1px solid #C4C4C4;
-  margin: -7px 0px 0px 0px;
-  padding: 7px 15px 6px 6px;
-  position: relative;
-  z-index: 2;
-
-  min-height: 50px;
-
-  h1{
-    font-family: $font-family-primary;
-    font-weight: 200;
-    font-size: 25px;
-    margin-top: 6px;
-    color: #333;
-    text-shadow: 1px 1px 0 #fff;
-    @include display_inline_block;
-    padding: 6px 7px 7px 7px;
-    width: 490px; /* Otherwise we overlap with other components */
-
-    &.disabled{color: #c4c4c4;}
-
-    &.users{
-      padding-left: 54px;
-      background: transparent url('../../images/admin_h1_icons.png') 7px 7px no-repeat;
-    }
-    &.groups{
-      padding-left: 54px;
-      background: transparent url('../../images/admin_h1_icons.png') 7px -34px no-repeat;
-    }
-    &.images{
-      padding-left: 54px;
-      position: relative;
-      &:before{ content: ''; position: absolute; left: 12px; width: 27px; height: 100%; background: transparent url('../../images/buildpush_symbols.png') 0px 0px no-repeat; }
-      width: 350px;
-    }
-  }
-
-  #obj_actions{
-    position: absolute;
-    right: 0px;
-    top: 22px;
-    @include display_inline_block;
-    margin-right: 24px;
-  }
-
-  .button{
-    border-color: #fff;
+    float: right;
+    margin: 13px 7px 12px 24px;
   }
 
   div.return_to{
@@ -1378,14 +1105,12 @@ header.admin-page-header{
     }
   }
 
-
   ul#provider_select{
     @include display_inline_block;
     list-style-type: none;
     position: relative;
     & > li{
-      height: 30px;
-      padding: 0px 15px 0px 0px;
+      padding: 0px 15px 15px 0px;
       margin: 0px 15px 0px 10px;
       background: transparent url('../../images/admin_header_provider_select.png') right 1px no-repeat;
       & > a{
@@ -1454,7 +1179,7 @@ Breadcrumb Navigation -- v.0.0.2 [nav_hist_bar] (nav_hist_bar.scss)
 nav#nav_history{
 
   display: block;
-  margin: 6px 0px 12px 0px;
+  padding: 6px 10px;
 
   ol.nav_hist_bar{
 
@@ -1490,11 +1215,24 @@ $dd_padding: 10px;
 $dd_icon_padding_right: 4px;
 
 #scoreboard{
-
-  background-color: #efefef;
-  @include display_inline_block;
-  padding: 8px $dd_padding 10px $dd_padding;
-  height: 40px;
+  font-family: overpass;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -o-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+  min-height: 7em;
+  width: 100%;
+  padding: 2em 1em 1em 1em;
+  background-color: #f6f6f6;
+  /*box-shadow*/
+  -webkit-box-shadow: inset 0em .06em 1em #ddd;
+  -moz-box-shadow: inset 0em .06em 1em #ddd;
+  box-shadow: inset 0em .06em 1em #ddd;
+  /*border-radius*/
+  -webkit-border-radius: 0em 0em .5em .5em;
+  -moz-border-radius: 0em 0em .5em .5em;
+  border-radius: 0em 0em .5em .5em;
 
   /* statistic group list */
   ul.groups{ list-style: none; }
@@ -1504,9 +1242,8 @@ $dd_icon_padding_right: 4px;
     margin: 0px;
   }
   ul.groups > li + li{
-    background: transparent url('../../images/sb_separator.png') repeat-y 0px 0px;
-    padding-left: 2px;
-    margin-left: -6px;
+    padding: 0em 1em;
+    border-left: .1em dotted #ddd;
   }
 
   /* statistic sub-group list */
@@ -1601,85 +1338,11 @@ $font-family-base: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helve
 $font-family-em: "Lucida Sans", "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
 $font-family-primary: Helvetica, Arial, "Lucida Grande", sans-serif;
 
-
 section.content-section{
-  padding: 4px;
-  margin-bottom: 36px;
-
-  /* Header code */
-  header{
-    background: transparent url('../../images/section-border.png') repeat-x bottom left;
-    position: relative;
-    h2{
-      font-family: $font-family-primary;
-      font-size: 21px;
-      font-weight: 200;
-      @include display_inline_block;
-      vertical-align: middle;
-      margin-bottom: 4px;
-    }
-    .badge{
-    }
-    .section-controls{
-      position: absolute;
-      right: 0px;
-      bottom: 4px;
-      @include display_inline_block;
-      font-size: 11px;
-
-      a.collapse{
-        text-decoration: none;
-        color: #666;
-      }
-    }
-
-    /* nav */
-    nav.faceted{
-      ul{ list-style: none; font-family: $font-family-primary; }
-      li{
-        @include display_inline_block;
-        margin-bottom: 1px;
-      }
-      li + li{ margin-left: 40px; }
-      a{
-        @include display_inline_block;
-        padding-bottom: 6px;
-        text-decoration: none;
-        color: #666;
-        font-weight: 200;
-        font-size: 16px;
-      }
-      a.active{
-        border-bottom: 4px solid #0084b7;
-        font-weight: bold;
-        color: #000;
-      }
-    }
-  }
-
-  /* Content */
-
-  .content{
-    margin-top: 10px;
-  }
-
-  .content.tight{
-    margin-top: 0px;
-  }
-
-}
-
-header.page-header + section.content-section{margin-top: 36px;}
-#scoreboard + section.content-section{ margin-top: 36px; }
-section.content-section + section.content-section {margin-top: 36px;}
-
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Administer Content Section Container -- v.0.0.1 [section] (section.scss)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-section.admin-content-section{
   padding: 4px 15px 15px 15px;
   border-bottom: 1px solid #C4C4C4;
+  margin-bottom: 10px;
+  @include clearfix;
 
   background: -moz-linear-gradient(top, rgba(255,255,255,0) 50%, rgba(234,234,234,1) 100%); /* FF3.6+ */
   background: -webkit-gradient(linear, left top, left bottom, color-stop(50%,rgba(255,255,255,0)), color-stop(100%,rgba(234,234,234,1))); /* Chrome,Safari4+ */
@@ -1698,7 +1361,6 @@ section.admin-content-section{
       font-size: 21px;
       font-weight: 200;
       @include display_inline_block;
-      vertical-align: middle;
       margin-bottom: 4px;
       padding: 2px 40px 0px 0px;
 
@@ -1723,15 +1385,12 @@ section.admin-content-section{
 
       &.alerts{color: #c00000;}
     }
-    .badge{
-      vertical-align: 2px;
-    }
+
     .section-controls{
       position: absolute;
       right: 0px;
       bottom: 4px;
       @include display_inline_block;
-      vertical-align: middle;
       font-size: 11px;
 
       a.collapse{
@@ -1739,29 +1398,31 @@ section.admin-content-section{
         color: #666;
       }
     }
-    nav.faceted{
-      float: right;
-    }
   }
 
   /* nav */
   nav.faceted{
-    ul{ list-style: none; @include display_inline_block; font-family: $font-family-primary; }
-    li{ @include display_inline_block; margin-bottom: 1px; }
+    border-bottom: 1px solid #ccc;
+    ul{ list-style: none; font-family: $font-family-primary; }
+    li{
+      @include display_inline_block;
+    }
     li + li{ margin-left: 40px; }
     a{
       @include display_inline_block;
+      font-family: overpass;
+      font-size: 1.3em;
       padding-bottom: 6px;
       text-decoration: none;
-      color: #666;
-      font-weight: 200;
-      font-size: 16px;
+      color: #aaa;
     }
     a.active{
       border-bottom: 4px solid #0084b7;
-      font-weight: bold;
       color: #000;
     }
+    a:hover{
+      color: #555;
+    }
   }
 
   /* Content */
@@ -1770,22 +1431,14 @@ section.admin-content-section{
     margin-top: 10px;
   }
 
-  .content.tight{
-    margin-top: 0px;
-  }
-
   p.description{ margin-bottom: 20px }
 
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Centered div
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  /* Centered div */
   div.centered{
     width: 600px; margin: 10px auto;
   }
 
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Left aligned div
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+  /* Left aligned div */
   div.lefted{
     padding-right: 380px;
     margin: 0px 50px;
@@ -1803,9 +1456,8 @@ Left aligned div
 
 }
 
-header.admin-page-header + section.admin-content-section{margin-top: 10px;}
-section.admin-content-section + section.admin-content-section {margin-top: 10px;}
-section.admin-content-section{ margin-bottom: 10px; }
+header.page-header + section.content-section{margin-top: 26px;}
+#scoreboard + section.content-section{ margin-top: 26px; }
 
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Build Push
@@ -1817,25 +1469,6 @@ div.lefted.image-upload-overview{
 div.lefted.new-catalog-entry-from-image{
   position: relative;
   &:after{ content: ''; position: absolute; top: 0px; right: 100px; width: 185px; height: 100%; background: transparent url('../../images/new_catalog_entry_from_image.png') 0px no-repeat; }
-
-  fieldset > div {
-    min-height: 32px;
-  }
-}
-
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-New/Edit Provider Form
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#x-deltacloud-provider-legend {
-
-  dl {
-    margin-left: 190px;
-  }
-
-  dt {
-    margin-top: 1em;
-    font-weight: bold;
-  }
 }
 
 
@@ -3363,30 +2996,28 @@ $font-family-base: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helve
 $label-font: "Lucida Sans", "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
 $font-family-primary: Helvetica, Arial, "Lucida Grande", sans-serif;
 
-body.monitor form.generic{
+form.generic{
 
-  fieldset{
-    p + p{
-      margin-top: 10px;
+  div.field{
+    @include clearfix;
+
+    ul.radio-group input{
+      margin: 6px 0px 0px 0px;
     }
-    p.radio-group label{
-      display: inline;
+    ul.radio-group li{
+      display: block;
+      list-style-type: none;
+      overflow: hidden;
+      @include clearfix;
     }
   }
 
-  fieldset.inline p{
-    @include display_inline_block;
-  }
-
-  fieldset.em{
-    padding: 10px;
-    background-color: #dfdfdf;
-    border: 1px solid #999;
-    margin: 10px 0px 10px 0px;
+  div.field + div.field{
+    margin-top: 10px;
   }
 
-  fieldset + fieldset{
-    margin-top: 10px;
+  fieldset{
+    margin-top: 20px;
   }
 
   fieldset legend{
@@ -3408,20 +3039,6 @@ body.monitor form.generic{
     }
   }
 
-  body.administer label{
-    float: left;
-    width: 200px;
-    text-align: right;
-    padding: 6px 7px 5px 0px;
-
-    &.checkbox{
-      padding: 3px 7px 0px 0px;
-    }
-    &.em{
-      padding: 10px 7px 8px 0px;
-    }
-  }
-
   label span{
     font-size: 11px;
     color: #666;
@@ -3429,8 +3046,13 @@ body.monitor form.generic{
 
   input[type="text"],input[type="password"]{
     padding: 4px;
+    margin: 0px;
     width: 200px;
     font-size: 13px;
+    border: 1px solid #C4C4C4;
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.50);
+    -moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
+    -webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
   }
 
   input.em{
@@ -3448,97 +3070,43 @@ body.monitor form.generic{
 
   textarea{
     padding: 5px 4px;
-    margin: 2px 0px;
+    margin: 0px;
+    resize: vertical;
+    border: 1px solid #C4C4C4;
+    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.50);
+    -moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
+    -webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
     height: 100px;
 
     &.long{ width: 400px }
-  }
-}
-
-/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Administer section Form Components -- v.0.0.1 [form] (form.scss)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-$font-family-base: "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-$label-font: "Lucida Sans", "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-$font-family-primary: Helvetica, Arial, "Lucida Grande", sans-serif;
-
-body.administer form.generic{
-
-  fieldset{
-    p + p{
-      margin-top: 10px;
-    }
-    ul.radio-group input{
-      margin: 6px 0px 0px 0px;
-    }
-    ul.radio-group li{
-      display: block;
-      list-style-type: none;
-      overflow: hidden;
+    &.edit_xml{
+      box-sizing: border-box; -webkit-box-sizing:border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box;
+      width: 100%;
+      height: 300px;
     }
   }
+}
 
-  fieldset.inline p{
-    @include display_inline_block;
-  }
-
-  fieldset.em{
-    padding: 10px;
-    background-color: #dfdfdf;
-    border: 1px solid #999;
-    margin: 10px 0px 10px 0px;
-  }
-
-  fieldset + fieldset{
-    margin-top: 20px;
-  }
+/* Horizontal form*/
+form.generic.horizontal{
 
-  fieldset legend{
-    font-family: $font-family-primary;
-    font-size: 16px;
-    font-weight: light;
-  }
-
-  fieldset.options{
-    text-align: right;
-  }
+  .input{ margin-left: 210px; }
 
   label{
-    display: block;
     float: left;
-    width: 180px;
-    text-align: right;
-    padding: 6px 7px 5px 0px;
-    font-family: $label-font;
-    font-size: 12px;
-    text-shadow: 0px 1px 0px #ffffff;
-    font-weight: normal;
-  }
-
-  label span{
-    font-size: 11px;
-    color: #666;
-  }
-
-  input[type="text"],input[type="password"]{
-    padding: 4px;
-    margin: 0px;
     width: 200px;
-    font-size: 13px;
-    border: 1px solid #C4C4C4;
-    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.50);
-    -moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
-    -webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
-  }
-  input[type="checkbox"]{ margin: 6px 0px 5px 0px; }
+    text-align: right;
+    padding: 6px 0px 5px 0px;
 
-  input.long{
-    width: 400px;
+    &.checkbox{
+      padding: 3px 7px 0px 0px;
+    }
+    &.em{
+      padding: 10px 7px 8px 0px;
+    }
   }
 
-  input.short{
-    width: 100px;
-  }
+  input[type="checkbox"]{ margin: 3px 0px 2px 0px; }
 
   span.text_instead_input{
     @include display_inline_block;
@@ -3546,25 +3114,15 @@ body.administer form.generic{
     padding: 6px 0px;
   }
 
-  textarea{
-    padding: 5px 4px;
-    margin: 0px;
-    resize: vertical;
-    border: 1px solid #C4C4C4;
-    box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.50);
-    -moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
-    -webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
-    height: 100px;
+}
 
-    &.long{ width: 400px }
-    &.edit_xml{
-      box-sizing: border-box; -webkit-box-sizing:border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box;
-      width: 100%;
-      height: 300px;
-    }
-  }
+/* New/Edit Provider Form */
+#x-deltacloud-provider-legend {
+  dd + dt { margin-top: 10px; }
+  dd{ font-weight: normal; }
 }
 
+
 /* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Page Footer -- v.0.0.1 [footer] (footer.scss)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -3572,162 +3130,16 @@ Page Footer -- v.0.0.1 [footer] (footer.scss)
 /* Footer */
 
 footer.standard{
-  position: relative;
-  height: 40px;
   width: 100%;
   font-size: 11px;
   clear: both;
+  padding-bottom: 10px;
 
   div.container{
-    position: relative;
     margin: 0 auto;
-    width: 946px;
-    background: rgba(0, 0, 0, 0.12);
-    height: 40px;
-  }
-
-  #legal {
-    position: absolute;
-    top: 0;
-    right: 1em;
-    color: #fff;
-  }
-
-  nav.footer{
-    @include display_inline_block;
-    padding: 14px 14px 13px 14px;
-    a{
-      color: #fff;
-      margin-right: 6px;
-      text-decoration: none;
-      border-bottom: 1px dotted;
-    }
+    width: $width;
+    text-align: center;
+    color: #333;
   }
-
-  span.copyright{}
 }
-
-
-/*
-  Styles for new layout
-
-*/
-
-header.shell-design {
-  height: 5.5em !important;
-  > article {
-    max-width: 80em;
-    margin: 0 auto; }
-  nav#appnav > ul > li:hover > ul {
-    z-index: 9999 !important;
-    /*painfully silly hack*/
-    margin-top: -0.25em;
-    padding-top: 0em !important; } }
-
-/* bonus: fix up overview scorecard */
-
-#scoreboard {
-  font-family: overpass;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -o-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-  box-sizing: border-box;
-  min-height: 7em;
-  width: 100%;
-  padding: 2em 1em 1em 1em;
-  background-color: #f6f6f6;
-  /*box-shadow*/
-  -webkit-box-shadow: inset 0em .06em 1em #ddd;
-  -moz-box-shadow: inset 0em .06em 1em #ddd;
-  box-shadow: inset 0em .06em 1em #ddd;
-  /*border-radius*/
-  -webkit-border-radius: 0em 0em .5em .5em;
-  -moz-border-radius: 0em 0em .5em .5em;
-  border-radius: 0em 0em .5em .5em;
-  ul.groups > li + li {
-    background-image: none;
-    margin: 0em;
-    padding: 0em 1em;
-    border-left: .1em dotted #ddd; } }
-
-/* fixing up the content to work with new header*/
-
-div#content {
-  border-color: #eee;
-  background-image: none;
-  /*box-shadow*/
-  -webkit-box-shadow: inset 0px .25em .25em #aaa, 0px .5em 2em #000 !important;
-  -moz-box-shadow: inset 0px .25em .25em #aaa, 0px .5em 2em #000 !important;
-  box-shadow: inset 0px .25em .25em #aaa, 0px .5em 2em #000 !important;
-  /*border-radius*/
-  -webkit-border-radius: 0em 0em .5em .5em;
-  -moz-border-radius: 0em 0em .5em .5em;
-  border-radius: 0em 0em .5em .5em;
-  border-top: transparent none 0px; }
-
-/* Page header fixup */
-
-.administer nav#administer_nav {
-  background-image: none;
-  background-color: #ddd;
-  /*box-shadow*/
-  -webkit-box-shadow: inset 0em 0em 0em 1px rgba(0, 0, 0, 0.05), inset 0em 2px 0em rgba(255, 255, 255, 0.5), inset 0em -1em 2em rgba(0, 0, 0, 0.05), 0px 0.6em 0.5em -0.5em rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: inset 0em 0em 0em 1px rgba(0, 0, 0, 0.05), inset 0em 2px 0em rgba(255, 255, 255, 0.5), inset 0em -1em 2em rgba(0, 0, 0, 0.05), 0px 0.6em 0.5em -0.5em rgba(0, 0, 0, 0.3);
-  box-shadow: inset 0em 0em 0em 1px rgba(0, 0, 0, 0.05), inset 0em 2px 0em rgba(255, 255, 255, 0.5), inset 0em -1em 2em rgba(0, 0, 0, 0.05), 0px 0.6em 0.5em -0.5em rgba(0, 0, 0, 0.3);
-  /*border-radius*/
-  -webkit-border-radius: 0em;
-  -moz-border-radius: 0em;
-  border-radius: 0em; }
-
-div#content .page-header {
-  background-image: none;
-  background-color: #ddd;
-  /*box-shadow*/
-  -webkit-box-shadow: inset 0em 0em 0em 1px rgba(0, 0, 0, 0.05), inset 0em 2px 0em rgba(255, 255, 255, 0.5), inset 0em -1em 2em rgba(0, 0, 0, 0.05), 0px 0.6em 0.5em -0.5em rgba(0, 0, 0, 0.3);
-  -moz-box-shadow: inset 0em 0em 0em 1px rgba(0, 0, 0, 0.05), inset 0em 2px 0em rgba(255, 255, 255, 0.5), inset 0em -1em 2em rgba(0, 0, 0, 0.05), 0px 0.6em 0.5em -0.5em rgba(0, 0, 0, 0.3);
-  box-shadow: inset 0em 0em 0em 1px rgba(0, 0, 0, 0.05), inset 0em 2px 0em rgba(255, 255, 255, 0.5), inset 0em -1em 2em rgba(0, 0, 0, 0.05), 0px 0.6em 0.5em -0.5em rgba(0, 0, 0, 0.3);
-  /*border-radius*/
-  -webkit-border-radius: 0em;
-  -moz-border-radius: 0em;
-  border-radius: 0em;
-  h1 {
-    text-shadow: 0px 1px #eee;
-    font-family: overpass;
-    font-weight: normal;
-    &.section-index {
-      background-image: none; } } }
-
-.administer nav#administer_nav {
-  height: 6.5em !important;
-  li a {
-    padding: 4em 2em 2em 2em !important;
-    cursor: pointer; } }
-
-/* sub-tabs were wonky,  fixing them too */
-
-section {
-  &.admin-content-section > header, &.content-section header {
-    /*background-image: none !important;*/
-    /*box-shadow: inset 0px -1em 1em -1em  #dad*/
-    /*box-shadow: inset 0px -1em 1em -1em #dadada;*/
-    /*margin: 2em -1.25em;*/
-    /*padding: 0em 2em; }*/
-  }
-  &.admin-content-section > header nav a, &.content-section header nav a {
-    font-family: overpass;
-    font-size: 1.5em;
-    color: #aaa !important; }
-  &.admin-content-section > header nav a.active, &.content-section header nav a.active {
-    font-weight: normal !important;
-    color: #000  !important; }
-  &.admin-content-section > header nav a:hover, &.content-section header nav a:hover {
-    color: #555 !important; } }
-
-
-/* Navigation tabs should indicate those that are used */
-body.administer nav#appnav li:last-child a{background-color: #444  !important}
-body.monitor nav#appnav li:first-child a{background-color: #444  !important}
-
-
 /* layout 1558 */
diff --git a/src/app/views/catalogs/_form.html.haml b/src/app/views/catalogs/_form.html.haml
index 12d3bba..111569c 100644
--- a/src/app/views/catalogs/_form.html.haml
+++ b/src/app/views/catalogs/_form.html.haml
@@ -1,12 +1,14 @@
 - if @catalog.errors.any?
   = render 'layouts/error_messages', :object => @catalog
 %fieldset
-  %p.clearfix
+  .field
     = form.label :name
-    = form.text_field :name, :class => 'em long'
-  %p.clearfix
+    .input
+      = form.text_field :name, :class => 'em long'
+  .field
     = form.label :pool_id
-    = form.select(:pool_id, @pools.collect{|p| [p.name, p.id]}, :prompt =>  t("catalogs.form.select_pool"))
+    .input
+      = form.select(:pool_id, @pools.collect{|p| [p.name, p.id]}, :prompt =>  t("catalogs.form.select_pool"))
 
 %fieldset.options
   = link_to t('cancel'), catalogs_path, :class => 'button danger'
diff --git a/src/app/views/catalogs/_section_header.html.haml b/src/app/views/catalogs/_section_header.html.haml
index 08351d4..0789f03 100644
--- a/src/app/views/catalogs/_section_header.html.haml
+++ b/src/app/views/catalogs/_section_header.html.haml
@@ -1,4 +1,4 @@
-%header.admin-page-header
-  %h1{:class => controller.controller_name}=t('catalogs.catalogs')
+%header.page-header
   #obj_actions.button-group
     = link_to t('catalogs.new_catalog'), new_catalog_url, :class => 'button primary', :id => 'new_catalog_button'
+  %h1.no-icon=t('catalogs.catalogs')
diff --git a/src/app/views/catalogs/edit.html.haml b/src/app/views/catalogs/edit.html.haml
index 2e0d5ed..0188837 100644
--- a/src/app/views/catalogs/edit.html.haml
+++ b/src/app/views/catalogs/edit.html.haml
@@ -1,13 +1,13 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @catalog.name
+%header.page-header
   #obj_actions.button-container
     = link_to t('catalogs.new_catalog'), new_catalog_url, :class => 'button primary', :id => 'new_catalog_button'
+  %h1.no-icon= @catalog.name
 
-%section.admin-content-section.user
+%section.content-section.user
   %header
     %h2= @title
 
   .content
-    = form_for @catalog, :url => catalog_path(@catalog), :html => { :method => :put, :class => 'generic' } do |f|
+    = form_for @catalog, :url => catalog_path(@catalog), :html => { :method => :put, :class => 'generic horizontal' } do |f|
       = render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/catalogs/new.html.haml b/src/app/views/catalogs/new.html.haml
index e3a32fb..22b716f 100644
--- a/src/app/views/catalogs/new.html.haml
+++ b/src/app/views/catalogs/new.html.haml
@@ -1,13 +1,13 @@
 = render :partial => 'layouts/admin_nav'
 
-%header.admin-page-header
-  %h1= @title
+%header.page-header
   #obj_actions
     .return_to
       = t'return_to'
       = link_to t("catalogs.catalogs"), catalogs_path
+  %h1.no-icon= @title
 
-%section.admin-content-section
+%section.content-section
   .content
-    = form_for @catalog, :url => catalogs_path, :html => {:class => 'generic'} do |f|
+    = form_for @catalog, :url => catalogs_path, :html => {:class => 'generic horizontal'} do |f|
       = render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/catalogs/show.html.haml b/src/app/views/catalogs/show.html.haml
index f925907..d373b0f 100644
--- a/src/app/views/catalogs/show.html.haml
+++ b/src/app/views/catalogs/show.html.haml
@@ -1,6 +1,5 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @title
+%header.page-header
   #obj_actions.button-container
     - if check_privilege(Privilege::CREATE, Catalog)
       = link_to t('catalogs.new_catalog'), new_catalog_url, :class => 'button primary', :id => 'new_catalog_button'
@@ -8,15 +7,16 @@
       - if check_privilege(Privilege::MODIFY, @catalog)
         = link_to t('edit'), edit_catalog_path(@catalog), :class => 'button pill', :id => 'edit_button'
         = button_to t("delete"), catalog_path(@catalog), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete'
+  %h1.no-icon= @title
 
-%section.admin-content-section.user
+%section.content-section.user
   %header
     %h2=t'properties'
 
   .content
     = render :partial => 'properties'
 
-%section.admin-content-section.catalog_entries
+%section.content-section.catalog_entries
   %header
     %h2=t('catalog_entries.index.catalog_entries')
 
diff --git a/src/app/views/config_servers/_config_server_form.haml b/src/app/views/config_servers/_config_server_form.haml
index 871d198..bdcc312 100644
--- a/src/app/views/config_servers/_config_server_form.haml
+++ b/src/app/views/config_servers/_config_server_form.haml
@@ -1,16 +1,19 @@
 - if @config_server.errors.any?
   = render 'layouts/error_messages', :object => @config_server
 %fieldset
-  %p.clearfix
+  .field
     = hidden_field_tag "provider_account_id", @provider_account.id
     = form.label :endpoint
-    = form.text_field :endpoint, :class => 'em long'
-  %p.clearfix
+    .input
+      = form.text_field :endpoint, :class => 'em long'
+  .field
     = form.label :key
-    = form.text_field :key
-  %p.clearfix
+    .input
+      = form.text_field :key
+  .field
     = form.label :secret
-    = password_field_tag "config_server[secret]", @config_server.secret
+    .input
+      = password_field_tag "config_server[secret]", @config_server.secret
 
 %fieldset.options
   = link_to t(:cancel), provider_provider_account_path(@provider_account.provider, @provider_account), :class => "button danger"
diff --git a/src/app/views/config_servers/_section_header.haml b/src/app/views/config_servers/_section_header.haml
index e83062f..50b7dcd 100644
--- a/src/app/views/config_servers/_section_header.haml
+++ b/src/app/views/config_servers/_section_header.haml
@@ -1,2 +1,2 @@
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= t('.config_server')
+%header.page-header
+  %h1.no-icon= t('.config_server')
diff --git a/src/app/views/config_servers/edit.haml b/src/app/views/config_servers/edit.haml
index b0586a6..ae88662 100644
--- a/src/app/views/config_servers/edit.haml
+++ b/src/app/views/config_servers/edit.haml
@@ -6,5 +6,5 @@
     %h2= t('.edit_config_server')
 
   .content
-    = form_for @config_server, :url => config_server_path(@config_server), :html => {:method => :put, :class => "generic"} do |f|
+    = form_for @config_server, :url => config_server_path(@config_server), :html => {:method => :put, :class => "generic horizontal"} do |f|
       = render :partial => 'config_server_form', :locals => {:form => f}
diff --git a/src/app/views/config_servers/new.haml b/src/app/views/config_servers/new.haml
index 171384c..6f9b9a4 100644
--- a/src/app/views/config_servers/new.haml
+++ b/src/app/views/config_servers/new.haml
@@ -1,10 +1,10 @@
 = render :partial => 'layouts/admin_nav'
 = render :partial => 'section_header'
 
-%section.admin-content-section.config_server
+%section.content-section.config_server
   %header
     %h2= t('.new_config_server')
 
   .content
-    = form_for @config_server, :url => config_servers_path, :html => {:class => "generic"} do |f|
+    = form_for @config_server, :url => config_servers_path, :html => {:class => "generic horizontal"} do |f|
       = render :partial => 'config_server_form', :locals => {:form => f }
diff --git a/src/app/views/deployables/_form.html.haml b/src/app/views/deployables/_form.html.haml
index 609715f..0a7e11d 100644
--- a/src/app/views/deployables/_form.html.haml
+++ b/src/app/views/deployables/_form.html.haml
@@ -3,27 +3,31 @@
 %fieldset
   - if params[:edit_xml]
     = hidden_field_tag :edit_xml, true
-    %p.clearfix
-      %h2= t('.deployable_xml')
+    .field
+      = form.label :xml
       = form.text_area :xml, :class => 'edit_xml'
   - else
-    %p.clearfix
+    .field
       = label_tag :catalog_id, t('.catalog')
-      %span.text_instead_input
-        - if @catalog.present?
-          =@catalog.name
-        - else
-          %em=t('deployables.new.no_catalog_selected')
-    %p.clearfix
-      = form.label :name
-      = form.text_field :name, :class => 'long'
-    %p.clearfix
+      .input
+        %span.text_instead_input
+          - if @catalog.present?
+            =@catalog.name
+          - else
+            %em=t('deployables.new.no_catalog_selected')
+    .field
+      = form.label :name, :class => 'em'
+      .input
+        = form.text_field :name, :class => 'em long'
+    .field
       = form.label :description
-      = form.text_area :description, :class => 'long'
-    %p.clearfix
+      .input
+        = form.text_area :description, :class => 'long'
+    .field
       = form.label :xml
-      %span.text_instead_input= link_to t("deployables.properties.edit_deployable_xml"), edit_polymorphic_path([@catalog, @deployable], :edit_xml=>true)
+      .input
+        %span.text_instead_input= link_to t("deployables.properties.edit_deployable_xml"), edit_polymorphic_path([@catalog, @deployable], :edit_xml=>true)
 
-%fieldset.align-center
+%fieldset.options
   = link_to t('cancel'), polymorphic_path([@catalog, @deployable]), :class => 'button danger'
   = submit_tag t('save'), :name => 'save', :class => 'button', :id => 'save_button'
diff --git a/src/app/views/deployables/_from_url.html.haml b/src/app/views/deployables/_from_url.html.haml
index 8ac3c83..c238c0f 100644
--- a/src/app/views/deployables/_from_url.html.haml
+++ b/src/app/views/deployables/_from_url.html.haml
@@ -1,29 +1,34 @@
-= form_for @deployable, :url => polymorphic_path([@catalog, Deployable]), :html => {:class => 'generic', :multipart => true } do |form|
+= form_for @deployable, :url => polymorphic_path([@catalog, Deployable]), :html => {:class => 'generic horizontal', :multipart => true } do |form|
   - if @deployable.errors.any?
     = render 'layouts/error_messages', :object => @deployable
   %fieldset
     = hidden_field_tag('form_option', @form_option)
-    %p.clearfix
+    .field
       = form.label :catalog_id, t('deployables.form.catalog')
-      %span.text_instead_input
-        - if @catalog.present?
-          =@catalog.name
-        - else
-          %em=t('deployables.new.no_catalog_selected')
-    %p.clearfix
-      = form.label :name
-      = form.text_field :name, :class => 'em long'
-    %p.clearfix
+      .input
+        %span.text_instead_input
+          - if @catalog.present?
+            =@catalog.name
+          - else
+            %em=t('deployables.new.no_catalog_selected')
+    .field
+      = form.label :name, :class => 'em'
+      .input
+        = form.text_field :name, :class => 'em long'
+    .field
       = form.label :description
-      = form.text_area :description, :class => 'long'
-    %p.clearfix
+      .input
+        = form.text_area :description, :class => 'long'
+    .field
       = label_tag :url, t('deployables.form.deployable_xml_url')
-      = text_field_tag :url, nil, :class => 'long'
-    %p.clearfix
-      = label_tag :edit_xml, t('deployables.form.edit_xml_after_save')
-      = check_box_tag(:edit_xml, true, false)
+      .input
+        = text_field_tag :url, nil, :class => 'long'
+    .field
+      = label_tag :edit_xml, t('deployables.form.edit_xml_after_save'), :class => 'checkbox'
+      .input
+        = check_box_tag(:edit_xml, true, false)
 
-  %fieldset.align-center
+  %fieldset.options
     -if @catalog.present?
       = link_to t('cancel'), catalog_path(@catalog), :class => 'button danger'
     -else
diff --git a/src/app/views/deployables/_list.html.haml b/src/app/views/deployables/_list.html.haml
index 776be28..1b126b1 100644
--- a/src/app/views/deployables/_list.html.haml
+++ b/src/app/views/deployables/_list.html.haml
@@ -1,4 +1,4 @@
-%section.admin-content-section
+%section.content-section
   %header
     %h2=t'catalog_entries.list.catalog_entries_list'
 
diff --git a/src/app/views/deployables/_new.html.haml b/src/app/views/deployables/_new.html.haml
index b1764cb..1ef6973 100644
--- a/src/app/views/deployables/_new.html.haml
+++ b/src/app/views/deployables/_new.html.haml
@@ -1,6 +1,6 @@
 = render :partial => 'section_header'
 
-%section.admin-content-section
+%section.content-section
   %header
     %h2=t'catalog_entries.new.add_catalog_entry'
 
diff --git a/src/app/views/deployables/_new_from_image.html.haml b/src/app/views/deployables/_new_from_image.html.haml
index c7d148f..9291f1e 100644
--- a/src/app/views/deployables/_new_from_image.html.haml
+++ b/src/app/views/deployables/_new_from_image.html.haml
@@ -1,9 +1,9 @@
-%header.admin-page-header
-  %h1.images= @deployable.name.blank? ? "&nbsp;".html_safe : t('.catalog_entry_name', :name => @deployable.name)
+%header.page-header
+  %h1.no-icon= @deployable.name.blank? ? "&nbsp;".html_safe : t('.catalog_entry_name', :name => @deployable.name)
 
-%section.admin-content-section
+%section.content-section
   .content
-    = form_for @deployable, :html => {:class => 'generic'} do |form|
+    = form_for @deployable, :html => {:class => 'generic horizontal'} do |form|
       = hidden_field_tag :create_from_image, params[:create_from_image]
       - if @deployable.errors.any?
         = render 'layouts/error_messages', :object => @deployable
@@ -11,33 +11,35 @@
         %h2= t('.title')
         %p= t('.description', :name => @image.name)
         %fieldset
-          %div.clearfix
-            = form.label :name, t('catalog_entries.new.name')
-            = form.text_field :name
-          %div.clearfix
+          .field
+            = form.label :name, :class => 'em'
+            .input
+              = form.text_field :name, :class => 'em'
+          .field
             = form.label :hardware_profile, t('catalog_entries.new.hw_profile')
-            = select_tag :hardware_profile, options_from_collection_for_select(@hw_profiles, :id, :name, params[:hardware_profile])
-          %div.clearfix
+            .input
+              = select_tag :hardware_profile, options_from_collection_for_select(@hw_profiles, :id, :name, params[:hardware_profile])
+          .field
             = form.label :catalog_id, t('deployables.form.catalog')
-            %span.text_instead_input#checked_catalogs_list= @selected_catalogs.empty? ? t('deployables.form.none') : @selected_catalogs.count > 1 ? t('deployables.form.multiple') : @selected_catalogs.first.name
-            %span.catalog_link
-              &nbsp
-              %div.catalog_list
-                %ul.more
-                  - if @catalogs.empty?
-                    = t('deployables.new_from_image.no_available_catalog')
-                  - else
-                    - @catalogs.each do |catalog|
-                      %li.catalog
-                        .catalog_with_checkbox
-                          = check_box_tag 'catalog_id[]', catalog.id, @selected_catalogs.any?{|c| c.id == catalog.id}
-                          = catalog.name
-                          .clear
+            .input
+              %span.text_instead_input#checked_catalogs_list= @selected_catalogs.empty? ? t('deployables.form.none') : @selected_catalogs.count > 1 ? t('deployables.form.multiple') : @selected_catalogs.first.name
+              %span.catalog_link
+                &nbsp
+                %div.catalog_list
+                  %ul.more
+                    - if @catalogs.empty?
+                      = t('deployables.new_from_image.no_available_catalog')
+                    - else
+                      - @catalogs.each do |catalog|
+                        %li.catalog
+                          .catalog_with_checkbox
+                            = check_box_tag 'catalog_id[]', catalog.id, @selected_catalogs.any?{|c| c.id == catalog.id}
+                            = catalog.name
+                            .clear
 
-      .centered
-        %fieldset.align-center
-          = link_to t('deployables.form.cancel'), catalogs_path, :class => 'button danger'
-          = submit_tag "#{t'deployables.form.save'}", :name => 'save', :class => 'button primary', :id => 'save_button', :disabled => @save_disabled
+      %fieldset.options.align-center
+        = link_to t('deployables.form.cancel'), catalogs_path, :class => 'button danger'
+        = submit_tag "#{t'deployables.form.save'}", :name => 'save', :class => 'button primary', :id => 'save_button', :disabled => @save_disabled
 
 :javascript
   function listChecked() {
diff --git a/src/app/views/deployables/_section_header.html.haml b/src/app/views/deployables/_section_header.html.haml
index 3d1e41d..861a12d 100644
--- a/src/app/views/deployables/_section_header.html.haml
+++ b/src/app/views/deployables/_section_header.html.haml
@@ -1,5 +1,5 @@
-%header.admin-page-header
-  %h1{:class => controller.controller_name}=t'catalog_entries.index.catalog_entries'
+%header.page-header
   #obj_actions.button-group
     - if check_privilege(Privilege::CREATE, Deployable)
       = link_to "#{t'catalog_entries.new_catalog_entry'}", new_polymorphic_path([@catalog, Deployable]), :class => 'button primary', :id => 'new_catalog_entry_button'
+  %h1.catalog_entries=t'catalog_entries.index.catalog_entries'
diff --git a/src/app/views/deployables/_upload.html.haml b/src/app/views/deployables/_upload.html.haml
index 34688da..24e621f 100644
--- a/src/app/views/deployables/_upload.html.haml
+++ b/src/app/views/deployables/_upload.html.haml
@@ -1,29 +1,34 @@
-= form_for @deployable, :url => polymorphic_path([@catalog, Deployable]), :html => {:class => 'generic', :multipart => true } do |form|
+= form_for @deployable, :url => polymorphic_path([@catalog, Deployable]), :html => {:class => 'generic horizontal', :multipart => true } do |form|
   - if @deployable.errors.any?
     = render 'layouts/error_messages', :object => @deployable
   %fieldset
     = hidden_field_tag('form_option', @form_option)
-    %p.clearfix
+    .field
       = label_tag :catalog_id, t('deployables.form.catalog')
-      %span.text_instead_input
-        -if @catalog.present?
-          =@catalog.name
-        - else
-          %em=t('deployables.new.no_catalog_selected')
-    %p.clearfix
-      = form.label :name
-      = form.text_field :name, :class => 'em long'
-    %p.clearfix
+      .input
+        %span.text_instead_input
+          -if @catalog.present?
+            =@catalog.name
+          - else
+            %em=t('deployables.new.no_catalog_selected')
+    .field
+      = form.label :name, :class => 'em'
+      .input
+        = form.text_field :name, :class => 'em long'
+    .field
       = form.label :description
-      = form.text_area :description, :class => 'long'
-    %p.clearfix
+      .input
+        = form.text_area :description, :class => 'long'
+    .field
       = form.label :xml, t('deployables.form.choose_xml')
-      = form.file_field :xml
-    %p.clearfix
-      = label_tag :edit_xml, t('deployables.form.edit_xml_after_save')
-      = check_box_tag(:edit_xml, true, false)
+      .input
+        = form.file_field :xml
+    .field
+      = label_tag :edit_xml, t('deployables.form.edit_xml_after_save'), :class => 'checkbox'
+      .input
+        = check_box_tag(:edit_xml, true, false)
 
-  %fieldset.align-center
+  %fieldset.options
     -if @catalog.present?
       = link_to t('cancel'), catalog_path(@catalog), :class => 'button danger'
     -else
diff --git a/src/app/views/deployables/edit.html.haml b/src/app/views/deployables/edit.html.haml
index 46bb038..2532eb0 100644
--- a/src/app/views/deployables/edit.html.haml
+++ b/src/app/views/deployables/edit.html.haml
@@ -1,11 +1,11 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @deployable.name
+%header.page-header
+  %h1.catalog_entries= @deployable.name
 
-%section.admin-content-section.user
+%section.content-section.user
   %header
     %h2=t'catalog_entries.edit.editing_catalog_entry'
 
   .content
-    = form_for @deployable, :url => polymorphic_path([@catalog, @deployable]), :html => { :method => :put, :class => 'generic' } do |f|
+    = form_for @deployable, :url => polymorphic_path([@catalog, @deployable]), :html => { :method => :put, :class => params[:edit_xml] ? "generic" : "generic horizontal" } do |f|
       = render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/deployables/show.html.haml b/src/app/views/deployables/show.html.haml
index e7abee2..b8666e6 100644
--- a/src/app/views/deployables/show.html.haml
+++ b/src/app/views/deployables/show.html.haml
@@ -1,6 +1,5 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @deployable.name
+%header.page-header
   #obj_actions.button-container
     .button-group
       - if check_privilege(Privilege::MODIFY, @deployable)
@@ -13,9 +12,10 @@
       = link_to t('.launch'), launch_deployment_button_path, :id => :launch_deployment_button, :'data-path' => launch_deployment_button_path
     -else
       %a{:id => :launch_deployment_button, :class => 'disabled', :'data-path' => launch_deployment_button_path}= t('.launch')
+  %h1.catalog_entries= @deployable.name
 
 
-%section.admin-content-section
+%section.content-section
   %header
     %h2.images= t('.images')
   .content
@@ -54,7 +54,7 @@
                 %ul
                   = render :partial => "image_uuids", :locals => {:uuid_arr => assembly[:build_and_target_uuids]}
 
-%section.admin-content-section
+%section.content-section
   - if @missing_images.empty?
     %header
       %h2.build= t('.build_status')
@@ -85,7 +85,7 @@
         - @missing_images.each do |uuid|
           %li= uuid
 
-%section.admin-content-section
+%section.content-section
   %header
     %h2.catalogs= t('.catalogs')
     .section-controls
@@ -112,7 +112,7 @@
             %td= catalog_entry.catalog.pool.pool_family.name
 
 - if check_privilege(Privilege::PERM_VIEW, at permission_object)
-  %section.admin-content-section
+  %section.content-section
     %header
       %h2.roles= t('role_assignments')
     .content
diff --git a/src/app/views/deployments/_header_show.html.haml b/src/app/views/deployments/_header_show.html.haml
index 391bc6f..eb4ff67 100644
--- a/src/app/views/deployments/_header_show.html.haml
+++ b/src/app/views/deployments/_header_show.html.haml
@@ -1,7 +1,6 @@
 %header.page-header
-  %h1.deployments= @title
   #obj_actions.button-container
     .button-group
       - if check_privilege(Privilege::MODIFY, @deployment)
-        = button_to t('delete'), deployment_path(@deployment), :method => :delete, :confirm => t("deployments.confirm_delete"), :class => "button pill danger", :id => 'delete'
-  .corner &nbsp;
+        = button_to t('delete'), deployment_path(@deployment), :method => :delete, :confirm => t("deployments.confirm_delete"), :class => "button danger", :id => 'delete'
+  %h1.deployments= @title
diff --git a/src/app/views/deployments/_launch_new.html.haml b/src/app/views/deployments/_launch_new.html.haml
index 46f1499..297d9f2 100644
--- a/src/app/views/deployments/_launch_new.html.haml
+++ b/src/app/views/deployments/_launch_new.html.haml
@@ -1,12 +1,11 @@
 = if request.xhr?
   = render :partial => '/layouts/new_notification'
 %header.page-header
+  #obj_actions.button-container
+    = link_to t('cancel'), pool_path(@pool), :class => 'button danger', :id => 'cancel_deployment_button'
   %h1.deployments
     = @title
     %span= t('deployments.launch_new.to_pool', :name => "#{@pool.name.capitalize}")
-  #obj_actions.button-container
-    = link_to t('cancel'), pool_path(@pool), :class => 'button danger', :id => 'cancel_deployment_button'
-  .corner &nbsp;
 
 %section.content-section.deployment
   %header
@@ -19,7 +18,7 @@
         = render 'layouts/error_messages', :object => @deployment
       = hidden_field :deployment, :pool_id
       %fieldset
-        %p
+        .field
           %label{:for => 'deployment_name'}
             = t 'deployments.deployment_name'
             %span
@@ -28,13 +27,13 @@
           %span#name_avail_indicator
 
       %fieldset
-        %p
+        .field
           %label{:for => 'deployable_id'}
             = t('catalog_entries.index.deployable')
           = select_tag :deployable_id, options_for_select(@deployables.map {|d| [d.name, d.id]}, params[:deployable_id])
 
       %fieldset
-        %p
+        .field
           %label{:for => 'frontend_realm_id'}
             = t('realms.index.realm')
           = select :deployment, :frontend_realm_id, @realm_choices
diff --git a/src/app/views/deployments/_overview.html.haml b/src/app/views/deployments/_overview.html.haml
index 4c94b57..62190f0 100644
--- a/src/app/views/deployments/_overview.html.haml
+++ b/src/app/views/deployments/_overview.html.haml
@@ -1,46 +1,57 @@
 - if @deployment.errors.any?
   = render 'layouts/error_messages', :object => @deployment
-= form_for @deployment do
-  %header.page-header
-    %h1{:class => controller.controller_name}= t('.pool_name', :pool => @pool.name)
-    .corner &nbsp;
+= form_for @deployment, :html => {:class => 'generic horizontal'} do
   = hidden_field :deployment, :pool_id
   = hidden_field :deployment, :frontend_realm_id
   = hidden_field_tag :launch_parameters_encoded, @launch_parameters_encoded
   = hidden_field_tag :deployable_id, params[:deployable_id]
 
-  %section.content-section.deployable_details
-    %header.confirmation
+  %header.page-header
+    %h1.pools= t('.pool_name', :pool => @pool.name)
+
+  %section.content-section
+    %header.align-center
       %h2= t('.header', :deployment => @deployment.name, :pool => @pool.name)
       %p= t('.confirmation', :deployment => @deployment.name, :pool => @pool.name, :quota => number_to_percentage(@additional_quota, :precision => 0))
 
     .content
-      %h3= t('.name')
-      %p= text_field :deployment, :name
-
-      - unless @deployment.deployable_xml.description.blank?
-        %h3= t '.description'
-        %p= @deployment.deployable_xml.description
-
-      %h3= t('.deployable_xml')
-      = link_to @deployable.xml_filename, definition_catalog_deployable_path(@deployable.catalogs.first, @deployable)
-      &rArr;
-
-      - if @realms.any?
-        %h3= t('realms.index.realm')
-        = select :deployment, :frontend_realm_id, @realm_choices
-        %div#realm-description
-
-      %h3= t('.image_ids')
-      %ul
-      - @deployment.deployable_xml.assemblies.each do |assembly|
-        %li.image-id
-          = assembly.image_id
-
-  #action-buttons
-    = link_to t(:cancel), pool_path(@pool), :class => 'button danger', :id => 'cancel_deployment_button'
-    = submit_tag t(:back), :class => 'button', :value => 'back'
-    = submit_tag t('.launch'), :id => 'launch_deployment_button', :disabled => (@errors && @errors.any?)
+      %fieldset
+        .field
+          = label_tag :name, t('.name'), :class => 'em'
+          .input
+            = text_field :deployment, :name, :class => 'em long'
+
+        - unless @deployment.deployable_xml.description.blank?
+          .field
+            = label_tag :description, t('.description')
+            .input
+              %span.text_instead_input= @deployment.deployable_xml.description
+
+        .field
+          = label_tag :deployable_xml, t('.deployable_xml')
+          .input
+            %span.text_instead_input
+              = link_to @deployable.xml_filename, definition_catalog_deployable_path(@deployable.catalogs.first, @deployable)
+              &rArr;
+
+        - if @realms.any?
+          .field
+            = label_tag :realm, t('realms.index.realm')
+            .input
+              = select :deployment, :frontend_realm_id, @realm_choices
+              %div#realm-description
+
+        .field
+          = label_tag :image_ids, t('.image_ids')
+          .input
+            %span.text_instead_input
+              %ul
+              - @deployment.deployable_xml.assemblies.each do |assembly|
+                %li.image-id= assembly.image_id
+      %fieldset.options.align-center
+        = link_to t(:cancel), pool_path(@pool), :class => 'button danger', :id => 'cancel_deployment_button'
+        = submit_tag t(:back), :class => 'button', :value => 'back'
+        = submit_tag t('.launch'), :id => 'launch_deployment_button', :disabled => (@errors && @errors.any?)
 -# Quota checking to go here as well, once I understand how it works with new code
 
 :javascript
diff --git a/src/app/views/deployments/confirm_terminate.html.haml b/src/app/views/deployments/confirm_terminate.html.haml
index 2ac762f..dd43007 100644
--- a/src/app/views/deployments/confirm_terminate.html.haml
+++ b/src/app/views/deployments/confirm_terminate.html.haml
@@ -1,6 +1,5 @@
 %header.page-header
-  %h1{:class => controller.controller_name}= t "instances.confirm_terminate.terminate_instances"
-  .corner &nbsp;
+  %h1.deployments= t "instances.confirm_terminate.terminate_instances"
 
 %section.content-section
   .content.confirm_instances_termination
diff --git a/src/app/views/deployments/launch_from_catalog.html.haml b/src/app/views/deployments/launch_from_catalog.html.haml
index 923ba64..f38a600 100644
--- a/src/app/views/deployments/launch_from_catalog.html.haml
+++ b/src/app/views/deployments/launch_from_catalog.html.haml
@@ -1,9 +1,9 @@
 = render :partial => 'layouts/nav_history'
 %header.page-header
-  %h1=@catalog.name
   #obj_actions.button-container
-    = link_to t('edit'), edit_catalog_path(@catalog), :class => 'button pill', :id => 'edit_button'
-  .corner &nbsp;
+    = link_to t('edit'), edit_catalog_path(@catalog), :class => 'button', :id => 'edit_button'
+  %h1.pools= @catalog.name
+
 %section.content-section
   - if @deployables.any?
     .align-center
diff --git a/src/app/views/deployments/launch_time_params.html.haml b/src/app/views/deployments/launch_time_params.html.haml
index 3ea2546..d50781e 100644
--- a/src/app/views/deployments/launch_time_params.html.haml
+++ b/src/app/views/deployments/launch_time_params.html.haml
@@ -2,7 +2,6 @@
 %header.page-header
   %h1.deployments
     = t('pools.header_show.pool_name', :name => @deployment.pool.name)
-  .corner &nbsp;
 
 %section.content-section.deployments.launch-time-params
   %h2= t('.configure_launch_time_params')
diff --git a/src/app/views/hardware_profiles/_section_header.html.haml b/src/app/views/hardware_profiles/_section_header.html.haml
index 418a6ae..2ef093f 100644
--- a/src/app/views/hardware_profiles/_section_header.html.haml
+++ b/src/app/views/hardware_profiles/_section_header.html.haml
@@ -1,4 +1,4 @@
-%header.admin-page-header
-  %h1{:class => controller.controller_name}=t'hardware_profiles.hardware_profiles'
+%header.page-header
   #obj_actions.button-group
     = link_to t('hardware_profiles.list.new_hardware'), new_hardware_profile_url, :class => 'button primary', :id => 'new_hardware_profile_button'
+  %h1.hardware_profiles=t'hardware_profiles.hardware_profiles'
diff --git a/src/app/views/hardware_profiles/edit.html.haml b/src/app/views/hardware_profiles/edit.html.haml
index 8a24948..66219ad 100644
--- a/src/app/views/hardware_profiles/edit.html.haml
+++ b/src/app/views/hardware_profiles/edit.html.haml
@@ -1,13 +1,13 @@
 = render :partial => 'layouts/admin_nav'
 
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @title
+%header.page-header
   #obj_actions.button-container
     = link_to t('hardware_profiles.list.new_hardware'), hardware_profile_url, :class => 'button primary', :id => 'new_user_button'
     %div.button-group
       = link_to t('hardware_profiles.edit.cancel_editing'), hardware_profile_path(@hardware_profile), :class => 'button pill danger', :id => 'new_user_button'
+  %h1.hardware_profiles= @title
 
-%section.admin-content-section.hardware_profile
+%section.content-section.hardware_profile
   %header
     %h2=t('hardware_profiles.edit.edit_hwp')
 
diff --git a/src/app/views/hardware_profiles/new.html.haml b/src/app/views/hardware_profiles/new.html.haml
index c5b2db8..bedcda7 100644
--- a/src/app/views/hardware_profiles/new.html.haml
+++ b/src/app/views/hardware_profiles/new.html.haml
@@ -1,14 +1,13 @@
 = render :partial => 'layouts/admin_nav'
 
-%header.admin-page-header
-  %header
-  %h1= @title
+%header.page-header
   #obj_actions
     .return_to
       = t'return_to'
       = link_to t('hardware_profiles.hardware_profiles'), hardware_profiles_path
+  %h1.hardware_profiles= @title
 
-%section.admin-content-section
+%section.content-section
   = form_for @hardware_profile, :url => hardware_profiles_path, :html => { :multipart => true } do |hwp_form|
     = render :partial => "form", :locals => { :hwp_form => hwp_form }
 
diff --git a/src/app/views/hardware_profiles/show.html.haml b/src/app/views/hardware_profiles/show.html.haml
index 3415bce..d89fe39 100644
--- a/src/app/views/hardware_profiles/show.html.haml
+++ b/src/app/views/hardware_profiles/show.html.haml
@@ -1,6 +1,5 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @title
+%header.page-header
   #obj_actions.button-container
     - if check_privilege(Privilege::CREATE, HardwareProfile)
       = link_to t('hardware_profiles.list.new_hardware'), new_hardware_profile_url, :class => 'button primary', :id => 'new_role_button'
@@ -8,13 +7,14 @@
       - if check_privilege(Privilege::MODIFY, @hardware_profile) && !@hardware_profile.provider_hardware_profile?
         = link_to t('edit'), edit_hardware_profile_path(@hardware_profile), :class => 'button pill', :id => 'edit_button'
         = button_to t('delete'), hardware_profile_path(@hardware_profile), :method => :delete, :confirm => "Are you sure you want to delete?", :class => 'button pill danger'
-%section.admin-content-section.hardware_profile
+  %h1.hardware_profiles= @title
+%section.content-section.hardware_profile
   %header
     %h2=t 'properties'
   .content
     = render :partial => 'properties'
 - unless @hardware_profile.provider_hardware_profile?
-  %section.admin-content-section.hardware_profile
+  %section.content-section.hardware_profile
     %header
       %h2=t'hardware_profiles.show.matching_hwp'
     .content
diff --git a/src/app/views/images/edit_xml.html.haml b/src/app/views/images/edit_xml.html.haml
index d8e4978..4af44ec 100644
--- a/src/app/views/images/edit_xml.html.haml
+++ b/src/app/views/images/edit_xml.html.haml
@@ -1,20 +1,20 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1.images= @name
+%header.page-header
   #obj_actions.button-container
     .return_to
       = t :return_to
       = link_to t('images.environment', :environment => @environment.name), pool_family_path(@environment)
+  %h1.no-icon= @name
 
-%section.admin-content-section
-  %header
-    %h2= t('.edit')
+%section.content-section
 
-  .content.tight
+  .content
     = form_tag(overview_images_path, {:method => :post, :class => 'generic'}) do
       = hidden_field_tag :environment, @environment.id
       = hidden_field_tag :name, @name
-      = text_area_tag :image_xml, @xml, :class => 'edit_xml'
+      .field
+        = label_tag :image_xml, t('.edit_xml')
+        = text_area_tag :image_xml, @xml, :class => 'edit_xml'
 
       .centered
         %fieldset.align-center
diff --git a/src/app/views/images/import.html.haml b/src/app/views/images/import.html.haml
index c677fe0..9fdb103 100644
--- a/src/app/views/images/import.html.haml
+++ b/src/app/views/images/import.html.haml
@@ -1,26 +1,29 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1.images= t('.import_image')
+%header.page-header
   #obj_actions.button-container
     .return_to
       = t :return_to
       = link_to t('images.environment', :environment => @environment.name), pool_family_path(@environment)
+  %h1.no-icon= t('.import_image')
 
-%section.admin-content-section.image-import
+%section.content-section
 
-  %section#image-file-form
-    = form_tag(import_images_path, { :multipart => true, :method => :post, :class => :generic }) do
+  .content
+    = form_tag(import_images_path, { :multipart => true, :method => :post, :class => 'generic horizontal' }) do
       = hidden_field_tag :environment, @environment.id
       %fieldset
-        %p.clearfix
+        .field
           = label_tag :provider_account, t('.provider_account')
-          = select_tag :provider_account, options_for_select(@accounts.collect{|x| [x.label, x.id]})
-        %p.clearfix
+          .input
+            = select_tag :provider_account, options_for_select(@accounts.collect{|x| [x.label, x.id]})
+        .field
           = label_tag :image_id, t('.image_id')
-          = text_field_tag :image_id
-        %p.clearfix
+          .input
+            = text_field_tag :image_id
+        .field
           = label_tag :name, t('.name')
-          = text_field_tag :name
+          .input
+            = text_field_tag :name
 
-      .buttons.container
+      %fieldset.options
         = submit_tag t(:continue), :id => "file_button", :class => "button primary", :disabled => !@accounts.any?
diff --git a/src/app/views/images/new.html.haml b/src/app/views/images/new.html.haml
index 76f236c..59761e5 100644
--- a/src/app/views/images/new.html.haml
+++ b/src/app/views/images/new.html.haml
@@ -1,12 +1,12 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1.images= t('.new_image')
+%header.page-header
   #obj_actions.button-container
     .return_to
       = t(:return_to)
       = link_to t('images.environment', :environment => @environment.name), pool_family_path(@environment)
+  %h1.no-icon= t('.new_image')
 
-%section.admin-content-section
+%section.content-section
   .content
     .centered
       %p.description.align-center
@@ -21,36 +21,42 @@
       .clear
 
       %section#image-file-form
-        = form_tag(edit_xml_images_path, { :multipart => true, :class => 'generic' }) do
+        = form_tag(edit_xml_images_path, { :multipart => true, :class => 'generic horizontal' }) do
           = hidden_field_tag :environment, @environment.id
           %fieldset
-            %p.clearfix
-              = label_tag :name, t('.name')
-              = text_field_tag :name, @name
-            %p.clearfix
+            .field
+              = label_tag :name, t('.name'), :class => 'em'
+              .input
+                = text_field_tag :name, @name, :class => 'em'
+            .field
               = label_tag :image_file, t('.choose_file')
-              = file_field_tag :image_file
-            %p.clearfix
-              = label_tag :edit, t('.edit_file')
-              = check_box_tag :edit, 1, true
+              .input
+                = file_field_tag :image_file
+            .field
+              = label_tag :edit, t('.edit_file'), :class => 'checkbox'
+              .input
+                = check_box_tag :edit, 1, true
 
           %fieldset.align-center
             = link_to t(:cancel), pool_families_path, :class => "button danger"
             = submit_tag t(:continue), :id => "file_button", :class => "button primary"
 
       %section#image-url-form
-        = form_tag(edit_xml_images_path, { :multipart => true, :class => 'generic' }) do
+        = form_tag(edit_xml_images_path, { :multipart => true, :class => 'generic horizontal' }) do
           = hidden_field_tag :environment, @environment.id
           %fieldset
-            %p.clearfix
-              = label_tag :name, t('.name')
-              = text_field_tag :name, @name
-            %p.clearfix
+            .field
+              = label_tag :name, t('.name'), :class => 'em'
+              .input
+                = text_field_tag :name, @name, :class => 'em'
+            .field
               = label_tag :image_url, t('.image_url')
-              = text_field_tag :image_url, params[:image_url]
-            %p.clearfix
-              = label_tag :edit, t('.edit_file')
-              = check_box_tag :edit, 1, true
+              .input
+                = text_field_tag :image_url, params[:image_url]
+            .field
+              = label_tag :edit, t('.edit_file'), :class => 'checkbox'
+              .input
+                = check_box_tag :edit, 1, true
 
           %fieldset.align-center
             = link_to t(:cancel), pool_families_path, :class => "button danger"
diff --git a/src/app/views/images/overview.html.haml b/src/app/views/images/overview.html.haml
index f5f9256..0e0f70c 100644
--- a/src/app/views/images/overview.html.haml
+++ b/src/app/views/images/overview.html.haml
@@ -1,12 +1,12 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1.images= @name
+%header.page-header
   #obj_actions.button-container
     .return_to
       = t :return_to
       = link_to t('images.environment', :environment => @environment.name), pool_family_path(@environment)
+  %h1.no-icon= @name
 
-%section.admin-content-section
+%section.content-section
   .content
     = form_tag(images_path, {:method => :post}) do
       = hidden_field_tag :environment, @environment.id
diff --git a/src/app/views/images/show.html.haml b/src/app/views/images/show.html.haml
index 65491ae..4ef868d 100644
--- a/src/app/views/images/show.html.haml
+++ b/src/app/views/images/show.html.haml
@@ -1,6 +1,5 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @image.imported? ? @image.name + " (Imported)" : @image.name
+%header.page-header
   #obj_actions.button-container.images
     .return_to
       =t'return_to'
@@ -11,9 +10,10 @@
         - unless @image.imported?
           = link_to t('.template_xml'), template_image_path(@image.uuid), :class => 'button pill'
         = button_to t("delete"), image_path(@image.id), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger', :id => 'delete'
+  %h1.no-icon= @image.imported? ? @image.name + " (Imported)" : @image.name
 
 - user_can_build = (@environment and check_privilege(Privilege::USE, @environment))
-%section.admin-content-section
+%section.content-section
   %header
     %h2=t'properties'
   .content
@@ -22,7 +22,7 @@
         %tr
           %td= t('images.environment', :environment => @image.environment)
 
-%section.admin-content-section
+%section.content-section
   %header
     %h2= t('.provider_images')
     .section-controls
diff --git a/src/app/views/instances/confirm_terminate.html.haml b/src/app/views/instances/confirm_terminate.html.haml
index 64709eb..dc9927b 100644
--- a/src/app/views/instances/confirm_terminate.html.haml
+++ b/src/app/views/instances/confirm_terminate.html.haml
@@ -1,6 +1,5 @@
 %header.page-header
-  %h1{:class => controller.controller_name}= t ".terminate_instances"
-  .corner &nbsp;
+  %h1.deployments= t ".terminate_instances"
 
 %section.content-section
   .content.confirm_instances_termination
diff --git a/src/app/views/instances/show.html.haml b/src/app/views/instances/show.html.haml
index 633e89f..d4b96d5 100644
--- a/src/app/views/instances/show.html.haml
+++ b/src/app/views/instances/show.html.haml
@@ -1,8 +1,6 @@
 = render :partial => 'layouts/nav_history'
 %header.page-header
-  %h1.deployments
-    = @instance.name
-  .corner &nbsp;
+  %h1.deployments= @instance.name
 
 %section.content-section
   %header#tab-container-1
diff --git a/src/app/views/layouts/_admin_content_tabs.html.haml b/src/app/views/layouts/_admin_content_tabs.html.haml
index 1ddefbb..6f55e04 100644
--- a/src/app/views/layouts/_admin_content_tabs.html.haml
+++ b/src/app/views/layouts/_admin_content_tabs.html.haml
@@ -1,4 +1,4 @@
-%section.admin-content-section
+%section.content-section
   %header
     %nav.faceted
       %ul#tab-container-1-nav
diff --git a/src/app/views/layouts/_admin_environments_tabs.html.haml b/src/app/views/layouts/_admin_environments_tabs.html.haml
index 1ddefbb..5e89f29 100644
--- a/src/app/views/layouts/_admin_environments_tabs.html.haml
+++ b/src/app/views/layouts/_admin_environments_tabs.html.haml
@@ -1,4 +1,4 @@
-%section.admin-content-section
+%section.content-section
   %header
     %nav.faceted
       %ul#tab-container-1-nav
@@ -8,6 +8,5 @@
               = tab[:name]
             -if tab[:count]
               %span.label.badge.count.dark=tab[:count]
-    .clear
   .content#tab
     = render :partial => 'list'
diff --git a/src/app/views/layouts/_admin_users_tabs.html.haml b/src/app/views/layouts/_admin_users_tabs.html.haml
index 1ddefbb..6f55e04 100644
--- a/src/app/views/layouts/_admin_users_tabs.html.haml
+++ b/src/app/views/layouts/_admin_users_tabs.html.haml
@@ -1,4 +1,4 @@
-%section.admin-content-section
+%section.content-section
   %header
     %nav.faceted
       %ul#tab-container-1-nav
diff --git a/src/app/views/layouts/application.html.haml b/src/app/views/layouts/application.html.haml
index e97f85b..c5b6625 100644
--- a/src/app/views/layouts/application.html.haml
+++ b/src/app/views/layouts/application.html.haml
@@ -42,30 +42,24 @@
     = javascript_include_tag "lib/modernizr-custom.js"
     = csrf_meta_tag
     = yield :scripts
-  %body{:class => "#{(["pools" ,"deployments", "instances"].include? controller_name) ? 'monitor' : 'administer'}" }
-    #primary-container
+  %body
+    %header.shell-design
+      %article
+        %h1
+          = t("layout.appname")
+        %nav#appnav
+          = render_navigation :level => 1
+        / Notifications and user dropdown -- disable notifications for now
+        %section#usermenu
+          %a{:href => '#'}= current_user.name
+          %ul
+            %li= link_to t('masthead.my_account'), account_path
+            %li= link_to t('masthead.logout'), logout_path
 
-      %header.shell-design
-        %article
-          %h1
-            = t("layout.appname")
-          %nav#appnav
-            =render_navigation :level => 1
-          / Notifications and user dropdown -- disable notifications for now
-          %section#usermenu
-            %a{:href => '#'}= current_user.name
-            %ul
-              %li= link_to t('masthead.my_account'), account_path
-              %li= link_to t('masthead.logout'), logout_path
-
-      #content
-        = render :partial => '/layouts/new_notification' if flash.present? or content_for?(:error_messages)
-        -# works with any 960 container (.container_16 or .container_24)
-        = yield
-        .clear
-      .clearfooter
+    #content
+      = render :partial => '/layouts/new_notification' if flash.present? or content_for?(:error_messages)
+      = yield
+      .clear
     %footer.standard
       .container
-        #legal
-          %nav.footer
-            %span.copyright!= t('layout.copyright')
+        %span.copyright!= t('layout.copyright')
diff --git a/src/app/views/permissions/_new.html.haml b/src/app/views/permissions/_new.html.haml
index 3c2c95e..e508363 100644
--- a/src/app/views/permissions/_new.html.haml
+++ b/src/app/views/permissions/_new.html.haml
@@ -1,11 +1,11 @@
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @title
+%header.page-header
   #obj_actions.button-group
     .return_to
       = t'return_to'
       = link_to @return_text, @return_path, :id => 'new_pool_button'
+  %h1.no-icon= @title
 
-%section.admin-content-section.pools
+%section.content-section.pools
   .align-center
     %strong= @summary_text
   .content
diff --git a/src/app/views/pool_families/_form.html.haml b/src/app/views/pool_families/_form.html.haml
index ffd69eb..7eb30a7 100644
--- a/src/app/views/pool_families/_form.html.haml
+++ b/src/app/views/pool_families/_form.html.haml
@@ -1,15 +1,17 @@
 - if @pool_family.errors.any?
   = render 'layouts/error_messages', :object => @pool_family
 %fieldset
-  %p.clearfix
-    = form.label :name
-    = form.text_field :name, :title => 'pool_family_name', :value => @pool_family.name, :class => 'em long'
+  .field
+    = form.label :name, :class => 'em'
+    .input
+      = form.text_field :name, :title => 'pool_family_name', :value => @pool_family.name, :class => 'em long'
 
   = form.fields_for :quota do |quota_form|
-    %p.clearfix
+    .field
       = quota_form.label :maximum_running_instances, t(:maximum_running_instances)
-      = quota_form.text_field :maximum_running_instances
+      .input
+        = quota_form.text_field :maximum_running_instances
 
 %fieldset.options
-  = link_to t('cancel'), pool_families_path, :class => 'button danger pill'
-  = form.submit t(:save),  :class => "submit button pill"
+  = link_to t('cancel'), pool_families_path, :class => 'button danger'
+  = form.submit t(:save),  :class => "submit button"
diff --git a/src/app/views/pool_families/_section_header.html.haml b/src/app/views/pool_families/_section_header.html.haml
index 8fb7cf3..eab1a6c 100644
--- a/src/app/views/pool_families/_section_header.html.haml
+++ b/src/app/views/pool_families/_section_header.html.haml
@@ -1,5 +1,4 @@
 %header.page-header
-  %h1{:class => controller.controller_name} Pool Families
   #obj_actions.button-group
     = link_to 'New Pool Family', new_pool_family_url, :class => 'button primary', :id => 'new_pool_family_button'
-  .corner &nbsp;
+  %h1.pool_families Pool Families
diff --git a/src/app/views/pool_families/add_provider_accounts.html.haml b/src/app/views/pool_families/add_provider_accounts.html.haml
index dc1166a..2ca766e 100644
--- a/src/app/views/pool_families/add_provider_accounts.html.haml
+++ b/src/app/views/pool_families/add_provider_accounts.html.haml
@@ -1,12 +1,12 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1= @pool_family.name
+%header.page-header
   #obj_actions.button-container
     .return_to
       = t'return_to'
       = link_to @pool_family.name, pool_family_path(@pool_family, :details_tab => 'provider_accounts'), :id => 'new_pool_button'
+  %h1.pool_families= @pool_family.name
 
-%section.admin-content-section.pool_families
+%section.content-section.pool_families
   %h3= t("pool_families.choose_provider_accounts")
   %header#tab-container-1
     %h2.settings= #t("settings.settings")
diff --git a/src/app/views/pool_families/edit.html.haml b/src/app/views/pool_families/edit.html.haml
index 6faa288..e69cda6 100644
--- a/src/app/views/pool_families/edit.html.haml
+++ b/src/app/views/pool_families/edit.html.haml
@@ -1,16 +1,16 @@
 = render :partial => 'layouts/admin_nav'
 
-%header.admin-page-header
-  %h1= @title
+%header.page-header
   #obj_actions
     .return_to
       = t("return_to")
       = link_to t("pool_families.new.environments"), pool_families_path
+  %h1.pool_families= @title
 
-%section.admin-content-section.pool_family
+%section.content-section.pool_family
   %header
     %h2.settings= t("settings.settings")
 
   .content
-    = form_for @pool_family, :url => pool_family_path(@pool_family), :html => { :method => :put, :class => 'generic' } do |f|
+    = form_for @pool_family, :url => pool_family_path(@pool_family), :html => { :method => :put, :class => 'generic horizontal' } do |f|
       = render :partial => 'form', :locals => { :form => f, :cancel_path => providers_path }
diff --git a/src/app/views/pool_families/new.html.haml b/src/app/views/pool_families/new.html.haml
index 47707c6..9cf6bbf 100644
--- a/src/app/views/pool_families/new.html.haml
+++ b/src/app/views/pool_families/new.html.haml
@@ -1,12 +1,12 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1= @title
+%header.page-header
   #obj_actions
     .return_to
       = t("return_to")
       = link_to t("pool_families.new.environments"), pool_families_path
+  %h1.pool_families= @title
 
-%section.admin-content-section.pool_family
+%section.content-section.pool_family
   .content
-    = form_for @pool_family, :url => pool_families_path, :html => {:class => 'generic'} do |f|
+    = form_for @pool_family, :url => pool_families_path, :html => {:class => 'generic horizontal'} do |f|
       = render :partial => "form", :locals => { :form => f, :cancel_path => pool_families_path }
diff --git a/src/app/views/pool_families/show.html.haml b/src/app/views/pool_families/show.html.haml
index f1bb2ac..03318a5 100644
--- a/src/app/views/pool_families/show.html.haml
+++ b/src/app/views/pool_families/show.html.haml
@@ -1,12 +1,12 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1= @title
+%header.page-header
   #obj_actions.button-container
     .button-group
       = link_to t('edit'), edit_pool_family_path(@pool_family), :class => 'button pill'
       = button_to t('delete'), pool_family_path(@pool_family), :method => :delete, :confirm => t("pool_families.confirm_delete"), :class => "button pill danger", :id => 'delete_pool_family_button'
+  %h1.pool_families= @title
 
-%section.admin-content-section.pool_families
+%section.content-section.pool_families
   %header#tab-container-1
     %h2.settings= #t("settings.settings")
     %nav.faceted
diff --git a/src/app/views/pools/_edit.html.haml b/src/app/views/pools/_edit.html.haml
index 58c2d99..8849e42 100644
--- a/src/app/views/pools/_edit.html.haml
+++ b/src/app/views/pools/_edit.html.haml
@@ -1,9 +1,8 @@
 %header.page-header
-  %h1{:class => controller.controller_name}= @pool.name
   #obj_actions.button-container
     - if check_privilege(Privilege::CREATE, Pool)
       = link_to t('pools.new_pool'), new_pool_url, :class => 'button primary', :id => 'new_pool_button'
-  .corner &nbsp;
+  %h1.pools= @pool.name
 
 %section.content-section.user
   %header
diff --git a/src/app/views/pools/_form.html.haml b/src/app/views/pools/_form.html.haml
index 9c8211b..b93298b 100644
--- a/src/app/views/pools/_form.html.haml
+++ b/src/app/views/pools/_form.html.haml
@@ -3,27 +3,22 @@
     = render 'layouts/error_messages', :object => @pool
 
   %fieldset
-    %p
+    .field
       = form.label :name, :class => 'em'
       = form.text_field :name, :class => 'em long'
-    %p
+    .field
       = form.label :pool_family_id
       - if @pool_families
         = form.collection_select :pool_family_id, @pool_families, :id, :name
       - else
         = form.label :pool_family_id, @pool.pool_family.name
         = hidden_field_tag 'pool[pool_family_id]', @pool.pool_family_id
-
-  %fieldset
-    %p
-      %label
-        = t('quota')
+    .field
+      = label_tag :quota, t('quota')
       = text_field :quota, :maximum_running_instances, :title => t('provider_accounts.form.quota_instances'), :value => @quota.maximum_running_instances || 10, :id => "quota_instances"
       = check_box_tag :unlimited_quota, 1, @quota.maximum_running_instances.nil?
       = label_tag :unlimited_quota, t('.unlimited'), :class => 'checkbox'
-
-  %fieldset
-    %p
+    .field
       = form.check_box :enabled
       = form.label :enabled, "#{t('pools.form.pool_enabled')}?", :class => 'checkbox'
 
diff --git a/src/app/views/pools/_header_index.html.haml b/src/app/views/pools/_header_index.html.haml
index 6a1768f..702562a 100644
--- a/src/app/views/pools/_header_index.html.haml
+++ b/src/app/views/pools/_header_index.html.haml
@@ -1,11 +1,10 @@
 %header.page-header
-  %h1.section-index= t 'pools.index.overview'
   #obj_actions.button-container
     .button-group
       = pretty_filter_toggle(pools_path(:view => 'pretty', :page => params[:page]), pools_path(:view => 'filter', :page => params[:page]))
     .button-group
       - if check_privilege(Privilege::CREATE, Pool)
         = link_to t('pools.new_pool'), new_pool_path, { :class => 'button primary', :id => 'new_pool_button' }
-  .corner &nbsp;
+  %h1.section-index= t 'pools.index.overview'
 
 = render :partial => 'scoreboard_index'
diff --git a/src/app/views/pools/_header_show.html.haml b/src/app/views/pools/_header_show.html.haml
index bd20688..b20fc18 100644
--- a/src/app/views/pools/_header_show.html.haml
+++ b/src/app/views/pools/_header_show.html.haml
@@ -1,5 +1,4 @@
 %header.page-header
-  %h1.pools= @title
   #obj_actions.button-container
     - if check_privilege(Privilege::CREATE, Deployment, @pool)
       = link_to t('deployments.new_deployment'), launch_new_deployments_path(:pool_id => @pool.id), :class => 'button primary', :id => 'new_deployment_button'
@@ -7,6 +6,6 @@
       = render :partial => 'layouts/catalog_dropdown', :locals => {:catalogs => @pool.catalogs}
     .button-group
       - if check_privilege(Privilege::MODIFY, @pool)
-        = link_to t('edit'), edit_pool_path(@pool), :class => 'button pill', :id => 'edit_pool_button'
-        = button_to t('delete'), pool_path(@pool), :method => :delete, :confirm => t('pools.index.confirm_delete'), :class => "button pill danger", :id => 'delete_pool_button'
-  .corner &nbsp;
+        = link_to t('edit'), edit_pool_path(@pool), :class => 'button', :id => 'edit_pool_button'
+        = button_to t('delete'), pool_path(@pool), :method => :delete, :confirm => t('pools.index.confirm_delete'), :class => "button danger", :id => 'delete_pool_button'
+  %h1.pools= @title
diff --git a/src/app/views/pools/_pretty_list.html.haml b/src/app/views/pools/_pretty_list.html.haml
index 47e7a8b..7ae567a 100644
--- a/src/app/views/pools/_pretty_list.html.haml
+++ b/src/app/views/pools/_pretty_list.html.haml
@@ -1,6 +1,5 @@
 %header
-  %h2=t 'pools.index.your_pools'
-  %span.label.badge.dark.count= @pools.total_entries
+  %h2.pools=t 'pools.index.your_pools'
 
 .content#pools-list
   - @pools.each do |pool|
diff --git a/src/app/views/pools/_section_header.html.haml b/src/app/views/pools/_section_header.html.haml
index d3023fd..f25145e 100644
--- a/src/app/views/pools/_section_header.html.haml
+++ b/src/app/views/pools/_section_header.html.haml
@@ -1,4 +1,2 @@
 %header.page-header
-  %h1{:class => controller.controller_name}=t('pools.pools')
-
-  .corner &nbsp;
+  %h1.pools=t('pools.pools')
diff --git a/src/app/views/provider_accounts/_provider_form.html.haml b/src/app/views/provider_accounts/_provider_form.html.haml
index 158f99d..1a293f9 100644
--- a/src/app/views/provider_accounts/_provider_form.html.haml
+++ b/src/app/views/provider_accounts/_provider_form.html.haml
@@ -1,29 +1,33 @@
-%p.clearfix
-  = label :provider_account, t('provider_accounts.index.provider_account_name')
-  = text_field :provider_account, :label, :class => 'em long'
+.field
+  = label :provider_account, t('provider_accounts.index.provider_account_name'), :class => 'em'
+  .input
+    = text_field :provider_account, :label, :class => 'long em'
 - CredentialDefinition::CREDENTIAL_DEFINITIONS_ORDER.each do |cred_order|
   - @provider_account.all_credentials(@provider).each do |cred|
     - if cred_order == cred.credential_definition.name
-      %p.clearfix
+      .field
         = label_tag t("provider_accounts.credentials.labels.#{cred.credential_definition.label}")
-        - if cred.credential_definition.input_type == "password"
-          = password_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", cred.value
-        - elsif cred.credential_definition.input_type == "file"
-          %span.text_instead_input= t("provider_accounts.edit.file_already_uploaded") if cred.value
-          = file_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", :value => cred.value
-        - else
-          = text_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", cred.value
+        .input
+          - if cred.credential_definition.input_type == "password"
+            = password_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", cred.value
+          - elsif cred.credential_definition.input_type == "file"
+            %span.text_instead_input= t("provider_accounts.edit.file_already_uploaded") if cred.value
+            = file_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", :value => cred.value
+          - else
+            = text_field_tag "provider_account[credentials_hash][#{cred.credential_definition.name}]", cred.value
 
-%p.clearfix
+.field
   = label :provider_account, t('provider_accounts.index.priority')
-  = text_field :provider_account, :priority, :class => 'em'
-%p.clearfix
+  .input
+    = text_field :provider_account, :priority
+.field
   = label_tag t("quotas.quota")
-  = text_field :quota, :maximum_running_instances, :title => t('provider_accounts.form.quota_instances'), :value => @quota.maximum_running_instances || t('provider_accounts.properties.unlimited'), :id => "quota_instances"
-  (
-  %button.linkbutton.nospace{ :type => 'button', :onclick => "set_unlimited_quota(\"quota_instances\");" }
-    = t('provider_accounts.form.unlimited_quota')
-  )
+  .input
+    = text_field :quota, :maximum_running_instances, :title => t('provider_accounts.form.quota_instances'), :value => @quota.maximum_running_instances || t('provider_accounts.properties.unlimited'), :id => "quota_instances"
+    (
+    %button.linkbutton.nospace{ :type => 'button', :onclick => "set_unlimited_quota(\"quota_instances\");" }
+      = t('provider_accounts.form.unlimited_quota')
+    )
 
 :javascript
   function set_unlimited_quota(elem_id) {
diff --git a/src/app/views/provider_accounts/_provider_selection.html.haml b/src/app/views/provider_accounts/_provider_selection.html.haml
index a62fd2d..0f0127d 100644
--- a/src/app/views/provider_accounts/_provider_selection.html.haml
+++ b/src/app/views/provider_accounts/_provider_selection.html.haml
@@ -1,14 +1,16 @@
 %fieldset#provider_type
-  %p.clearfix
+  .field
     = label_tag :provider_name, t(".provider_name")
-    %span.text_instead_input= @provider.name
-  %p.clearfix
+    .input
+      %span.text_instead_input= @provider.name
+  .field
     = label_tag t('.cloud_type')
-    %span.text_instead_input= @provider.provider_type.name
-    - unless @provider.provider_type.deltacloud_driver.nil?
-      = render :partial => "provider_form", :locals => { :provider_type => @provider.provider_type}
-    - else
-      = flash.now[:warning] = t('provider_accounts.flash.warning.no_provider')
+    .input
+      %span.text_instead_input= @provider.provider_type.name
+  - unless @provider.provider_type.deltacloud_driver.nil?
+    = render :partial => "provider_form", :locals => { :provider_type => @provider.provider_type}
+  - else
+    = flash.now[:warning] = t('provider_accounts.flash.warning.no_provider')
 
 :javascript
   $(document).ready(function(){
diff --git a/src/app/views/provider_accounts/_section_header.html.haml b/src/app/views/provider_accounts/_section_header.html.haml
index 3f76287..1fe8cad 100644
--- a/src/app/views/provider_accounts/_section_header.html.haml
+++ b/src/app/views/provider_accounts/_section_header.html.haml
@@ -1,5 +1,4 @@
 %header.page-header
-  %h1{:class => controller.controller_name}=t'provider_accounts.index.provider_accounts'
   #obj_actions.button-group
     = link_to t('provider_accounts.new.new_provider_account'), new_provider_account_url, :class => 'button primary', :id => 'new_provider_account_button'
-  .corner &nbsp;
+  %h1.provider_accounts= t'provider_accounts.index.provider_accounts'
diff --git a/src/app/views/provider_accounts/edit.html.haml b/src/app/views/provider_accounts/edit.html.haml
index 7d1a1f1..b3b0849 100644
--- a/src/app/views/provider_accounts/edit.html.haml
+++ b/src/app/views/provider_accounts/edit.html.haml
@@ -1,20 +1,19 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1= @title
+%header.page-header
   #obj_actions
     .return_to
       =t'return_to'
       = link_to t('provider_accounts.new.cloud_providers'), edit_provider_path(@provider, :details_tab => 'accounts')
+  %h1.provider_accounts= @title
 
-%section.admin-content-section
+%section.content-section
   %header
     %h2.settings=t'settings.settings'
 
   .content
     - unless @providers.empty?
-      = form_for([@provider, @provider_account],  :url => provider_provider_account_path(@provider, @provider_account), :html => {:multipart => true,:method => :put, :class => 'generic'})  do |f|
+      = form_for([@provider, @provider_account],  :url => provider_provider_account_path(@provider, @provider_account), :html => {:multipart => true,:method => :put, :class => 'generic horizontal'})  do |f|
         = render :partial => "form", :locals => { :form => f }
         %fieldset.options
-          .button-group
-            = f.submit t('save'), :class => "button pill", :id => 'save'
-            = link_to t('provider_accounts.edit.delete_account'), provider_provider_account_path(@provider, @provider_account), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button pill danger'
+          = f.submit t('save'), :class => "button", :id => 'save'
+          = link_to t('provider_accounts.edit.delete_account'), provider_provider_account_path(@provider, @provider_account), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger'
diff --git a/src/app/views/provider_accounts/new.html.haml b/src/app/views/provider_accounts/new.html.haml
index e036b55..b7c05be 100644
--- a/src/app/views/provider_accounts/new.html.haml
+++ b/src/app/views/provider_accounts/new.html.haml
@@ -1,15 +1,15 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1= @title
+%header.page-header
   #obj_actions
     .return_to
       = t'return_to'
       = link_to t('provider_accounts.new.cloud_providers'), edit_provider_path(@provider, :details_tab => 'accounts')
+  %h1.provider_accounts= @title
 
-%section.admin-content-section.provider_accounts
+%section.content-section.provider_accounts
   .content
     - unless @providers.empty?
-      = form_for([@provider, @provider_account], :url => provider_provider_accounts_path(@provider), :html => {:multipart => true, :class => 'generic'})  do |f|
+      = form_for([@provider, @provider_account], :url => provider_provider_accounts_path(@provider), :html => {:multipart => true, :class => 'generic horizontal'})  do |f|
         = render :partial => "form", :locals => { :form => f }
         %fieldset.options
-          = f.submit t('save'), :class => "button pill", :id => 'save'
+          = f.submit t('save'), :class => "button", :id => 'save'
diff --git a/src/app/views/provider_accounts/show.html.haml b/src/app/views/provider_accounts/show.html.haml
index 5c2366c..72b753b 100644
--- a/src/app/views/provider_accounts/show.html.haml
+++ b/src/app/views/provider_accounts/show.html.haml
@@ -1,6 +1,5 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1= @title
+%header.page-header
   #obj_actions
     .return_to
       =t'return_to'
@@ -8,15 +7,16 @@
     .button-group
       = link_to t('edit'), edit_provider_provider_account_path(@provider, @provider_account), :class => "button pill", :title => "Edit Provider Account"
       = link_to t('provider_accounts.show.test_connection'), provider_provider_account_path(@provider, @provider_account, :test_account => true), :class => 'button pill'
+  %h1.provider_accounts= @title
 
-%section.admin-content-section
+%section.content-section
   %header
     %h2=t'properties'
 
   .content
     = render :partial => 'properties'
 
-%section.admin-content-section.realm
+%section.content-section.realm
   %header
     %h2= t'realm_s'
 
@@ -24,7 +24,7 @@
     = render :partial => 'provider_realms/list'
 
 - if check_privilege(Privilege::PERM_VIEW, at permission_object)
-  %section.admin-content-section
+  %section.content-section
     %header
       %h2.roles= t('role_assignments')
     .content
diff --git a/src/app/views/provider_realms/_section_header.html.haml b/src/app/views/provider_realms/_section_header.html.haml
index 0cb1d75..8aea23e 100644
--- a/src/app/views/provider_realms/_section_header.html.haml
+++ b/src/app/views/provider_realms/_section_header.html.haml
@@ -1,4 +1,4 @@
-%header.admin-page-header
-  %h1{:class => controller.controller_name} Realms
+%header.page-header
   #obj_actions.button-group
     = link_to t('realms.new_realm'), new_realm_url, :class => 'button primary', :id => 'new_realm_button'
+  %h1.realms Realms
diff --git a/src/app/views/provider_realms/show.html.haml b/src/app/views/provider_realms/show.html.haml
index 5e73088..a6fa471 100644
--- a/src/app/views/provider_realms/show.html.haml
+++ b/src/app/views/provider_realms/show.html.haml
@@ -1,23 +1,24 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @title
+%header.page-header
   #obj_actions.button_container
     .return_to
       = t('return_to')
       = link_to t('provider_realms.provider_realms'), edit_provider_path(@realm.provider, :details_tab =>  'realms', :only_tab =>  true), :id =>  'back_to_provider_realms_button'
+  %h1.realms= @title
+
 - unless @realm.available
-  %section.admin-content-section
+  %section.content-section
     %header.align-center
       %h2.disabled= t('realms.show.realm_unavailable', :name => @realm.name)
 
-%section.admin-content-section.realm
+%section.content-section.realm
   %header
     %h2= t'realms.show.properties'
 
   .content
     = render :partial => 'properties'
 
-%section.admin-content-section.realm_mapping
+%section.content-section.realm_mapping
   %header
     %h2= t'provider_realms.show.mapping'
 
diff --git a/src/app/views/providers/_edit.html.haml b/src/app/views/providers/_edit.html.haml
index 6dd36bb..8ba45fd 100644
--- a/src/app/views/providers/_edit.html.haml
+++ b/src/app/views/providers/_edit.html.haml
@@ -1,8 +1,8 @@
 .content
-  = form_for @provider, :url => provider_path(@provider), :html => { :method => :put, :class => 'generic' } do |f|
+  = form_for @provider, :url => provider_path(@provider), :html => { :method => :put, :class => 'generic horizontal' } do |f|
     = render :partial => 'form', :locals => { :form => f }
     %fieldset.options
-      #obj_actions.button-group
+      .button-group
         = f.submit "Save Changes", :class => "submit button pill", :id => 'save'
         = link_to "Test Connection", edit_provider_path(@provider, :test_provider => true), :class => 'button pill'
         = link_to 'Delete Provider', provider_path(@provider), :method => :delete, :confirm => t('providers.confirm_delete'), :class => "button pill danger", :id => "delete"
diff --git a/src/app/views/providers/_form.html.haml b/src/app/views/providers/_form.html.haml
index 395c911..387d952 100644
--- a/src/app/views/providers/_form.html.haml
+++ b/src/app/views/providers/_form.html.haml
@@ -1,24 +1,30 @@
 - if @provider.errors.any?
   = render 'layouts/error_messages', :object => @provider
 %fieldset
-  %p.clearfix
-    = form.label :name
-    = form.text_field :name, :value => @provider.name, :class => 'long'
-  %p.clearfix
+  .field
+    = form.label :name, :class => 'em'
+    .input
+      = form.text_field :name, :value => @provider.name, :class => 'em long'
+  .field
     = form.label :url
-    = form.text_field :url, :value => @provider.url, :class => 'long'
-  %p.clearfix
+    .input
+      = form.text_field :url, :value => @provider.url, :class => 'long'
+  .field
     = form.label :provider_type_id
-    = form.select(:provider_type_id, @provider_type_options, :prompt => t('providers.form.select_type_of_provider'))
-  %p.clearfix
+    .input
+      = form.select(:provider_type_id, @provider_type_options, :prompt => t('providers.form.select_type_of_provider'))
+  .field
     = form.label :deltacloud_provider, t('providers.form.x_deltacloud_provider.generic')
-    = form.text_field :deltacloud_provider, :title => t('providers.form.x_deltacloud_provider.generic'), :value => @provider.deltacloud_provider, :class => 'long'
-  %div#x-deltacloud-provider-legend.clearfix
+    .input
+      = form.text_field :deltacloud_provider, :title => t('providers.form.x_deltacloud_provider.generic'), :value => @provider.deltacloud_provider
+  .field#x-deltacloud-provider-legend
     %label= t('providers.form.x_deltacloud_provider_legend')
-    %dl
-      - @labeled_provider_types.each do |type|
-        %dt= type[:name]
-        %dd{ :class => type[:id] }= type[:label]
+    .input
+      %span.text_instead_input
+        %dl
+          - @labeled_provider_types.each do |type|
+            %dt= type[:name]
+            %dd{ :class => type[:id] }= type[:label]
 :javascript
   function updateXDeltacloudProviderLabel() {
     var selected_id = $('#provider_provider_type_id option:selected').val();
diff --git a/src/app/views/providers/_provider_availability.html.haml b/src/app/views/providers/_provider_availability.html.haml
index 7969389..2df0eb0 100644
--- a/src/app/views/providers/_provider_availability.html.haml
+++ b/src/app/views/providers/_provider_availability.html.haml
@@ -1,4 +1,4 @@
 - unless @provider.available
-  %section.admin-content-section
+  %section.content-section
     %header.align-center
       %h2.disabled= t('providers.edit.provider_unavailable', :name => @provider.name)
diff --git a/src/app/views/providers/_section_header.html.haml b/src/app/views/providers/_section_header.html.haml
index 8c59da3..039e3cf 100644
--- a/src/app/views/providers/_section_header.html.haml
+++ b/src/app/views/providers/_section_header.html.haml
@@ -1,5 +1,4 @@
-%header.admin-page-header
-  %h1{:class => @provider.enabled ? 'enabled' : 'disabled'}= @provider.name.blank? ? t("providers.editing_provider") : @provider.name
+%header.page-header
   #obj_actions
     %span.label.light= t("providers.choose_a_provider")
     %ul#provider_select
@@ -10,6 +9,7 @@
           - @providers.each do |provider|
             %li= link_to provider.name, edit_provider_path(provider)
 
-    = form_for @provider, :url => provider_path(@provider), :html => { :method => :put, :class => 'generic' } do |f|
+    = form_for @provider, :url => provider_path(@provider), :html => { :method => :put, :class => 'generic horizontal' } do |f|
       = f.hidden_field :enabled, :value => !@provider.enabled
       = f.submit "", :confirm => "#{@provider.enabled ? t("providers.disable_provider") : t("providers.enable_provider")}", :class => "provider_toggle #{@provider.enabled ? "on" : "off"}"
+  %h1.providers{:class => @provider.enabled ? 'enabled' : 'disabled'}= @provider.name.blank? ? t("providers.editing_provider") : @provider.name
diff --git a/src/app/views/providers/confirm_terminate.html.haml b/src/app/views/providers/confirm_terminate.html.haml
index ef60061..e32f4bb 100644
--- a/src/app/views/providers/confirm_terminate.html.haml
+++ b/src/app/views/providers/confirm_terminate.html.haml
@@ -1,7 +1,7 @@
 = render :partial => 'layouts/admin_nav'
 = render :partial => 'section_header'
 
-%section.admin-content-section
+%section.content-section
   %header
     %h2= t(".disable_provider?")
 
diff --git a/src/app/views/providers/edit.html.haml b/src/app/views/providers/edit.html.haml
index 86d3301..241ef55 100644
--- a/src/app/views/providers/edit.html.haml
+++ b/src/app/views/providers/edit.html.haml
@@ -3,7 +3,7 @@
 = render :partial => 'provider_availability'
 
 - unless @provider.enabled
-  %section.admin-content-section
+  %section.content-section
     %header.align-center
       %h2.disabled= t('providers.edit.provider_id_disabled')
     %p.align-center
@@ -11,7 +11,7 @@
       = t("providers.edit.enable_configure_providers")
       = image_tag "provider_enable_hint.png"
 
-%section.admin-content-section.alerts.collapse_entity
+%section.content-section.alerts.collapse_entity
   %header
     %h2.alerts
       = t("alerts_label")
@@ -27,13 +27,13 @@
               %dt.subject{ :class => alert[:class] }= alert[:subject]
               %dd.type= link_to alert[:alert_type], alert[:path]
               %dd.desc= alert[:description]
-/%section.admin-content-section.provider
+/%section.content-section.provider
 /  %header
 /    %h2.activity
 /      Activity
 /  .content
 /    unimplemented
-%section.admin-content-section
+%section.content-section
   %header#tab-container-1
     %h2.settings= t("settings.settings")
     %nav.faceted
@@ -43,6 +43,5 @@
             = link_to tab[:name], edit_provider_path(@provider, :details_tab => tab[:id], :only_tab => true), :id => "details_#{tab[:id]}", :class => "#{'active' if @details_tab[:id] == tab[:id]} show"
             -if tab[:count]
               %span.label.badge.count.dark=tab[:count]
-    .clear
   .content#tab
     = render :partial => @view
diff --git a/src/app/views/providers/index.html.haml b/src/app/views/providers/index.html.haml
index 9493772..c45d064 100644
--- a/src/app/views/providers/index.html.haml
+++ b/src/app/views/providers/index.html.haml
@@ -1,5 +1,5 @@
 = render :partial => 'layouts/admin_nav'
-%section.admin-content-section.provider
+%section.content-section.provider
   = t("providers.index.no_providers_available")
   - if check_privilege(Privilege::CREATE, Provider)
     = t("providers.index.create_one")
diff --git a/src/app/views/providers/new.html.haml b/src/app/views/providers/new.html.haml
index 27edfbb..e98e58e 100644
--- a/src/app/views/providers/new.html.haml
+++ b/src/app/views/providers/new.html.haml
@@ -1,6 +1,5 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1= @title
+%header.page-header
   #obj_actions
     %span.label.light Choose a provider:
     %ul#provider_select
@@ -10,12 +9,13 @@
           %li= link_to "+ " + t("providers.index.create_new_provider"), new_provider_path, :id => "create_new_provider"
           - @providers.each do |provider|
             %li= link_to provider.name, edit_provider_path(provider)
+  %h1.providers= @title
 
-%section.admin-content-section.users
+%section.content-section.users
   %header
     %h2.settings= t("settings.settings")
   .content
-    = form_for @provider, :url => providers_path, :html => {:class => 'generic'} do |f|
+    = form_for @provider, :url => providers_path, :html => {:class => 'generic horizontal'} do |f|
       = render :partial => "form", :locals => { :form => f, :cancel_path => providers_path }
       %fieldset.options
         = f.submit t("providers.new.save_provider"), :class => "submit button pill", :id => 'save'
diff --git a/src/app/views/providers/show.html.haml b/src/app/views/providers/show.html.haml
index 0bb23ec..e273e3e 100644
--- a/src/app/views/providers/show.html.haml
+++ b/src/app/views/providers/show.html.haml
@@ -2,7 +2,7 @@
 = render :partial => 'section_header'
 = render :partial => 'provider_availability'
 
-%section.admin-content-section.provider
+%section.content-section.provider
   %header
     %h2= t("properties")
 
diff --git a/src/app/views/realm_mappings/new.html.haml b/src/app/views/realm_mappings/new.html.haml
index aedadf5..c426aa0 100644
--- a/src/app/views/realm_mappings/new.html.haml
+++ b/src/app/views/realm_mappings/new.html.haml
@@ -1,9 +1,8 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %header
-    %h1= @title
+%header.page-header
+  %h1.realms= @title
 
-%section.admin-content-section
+%section.content-section
   - if @realm_target.errors.any?
     = render 'layouts/error_messages', :object => @realm_target
 
@@ -12,7 +11,7 @@
     = f.hidden_field :realm_or_provider_type
 
     %fieldset
-      %p.clearfix
+      .field
         - label_method = @realm_target.realm_or_provider_type == 'Realm' ? 'name_with_provider' : 'name'
         = select_tag 'realm_backend_target[realm_or_provider_id]', options_from_collection_for_select(@backend_targets, 'id', label_method)
 
diff --git a/src/app/views/realms/_form.html.haml b/src/app/views/realms/_form.html.haml
index 99eee2e..397ef3a 100644
--- a/src/app/views/realms/_form.html.haml
+++ b/src/app/views/realms/_form.html.haml
@@ -1,12 +1,14 @@
 - if @realm.errors.any?
   = render 'layouts/error_messages', :object => @realm
 %fieldset
-  %p.clearfix
-    = form.label :name
-    = form.text_field :name, :title => 'realm_name', :value => @realm.name, :class => 'em long'
-  %p.clearfix
+  .field
+    = form.label :name, :class => 'em'
+    .input
+      = form.text_field :name, :title => 'realm_name', :value => @realm.name, :class => 'em long'
+  .field
     = form.label :description
-    = form.text_area :description, :title => 'description', :value => @realm.description
+    .input
+      = form.text_area :description, :title => 'description', :value => @realm.description, :class => 'long'
 
 %fieldset.options
-  = form.submit t('save'), :class => "submit button pill"
+  = form.submit t('save'), :class => "submit button"
diff --git a/src/app/views/realms/_section_header.html.haml b/src/app/views/realms/_section_header.html.haml
index 0cb1d75..8aea23e 100644
--- a/src/app/views/realms/_section_header.html.haml
+++ b/src/app/views/realms/_section_header.html.haml
@@ -1,4 +1,4 @@
-%header.admin-page-header
-  %h1{:class => controller.controller_name} Realms
+%header.page-header
   #obj_actions.button-group
     = link_to t('realms.new_realm'), new_realm_url, :class => 'button primary', :id => 'new_realm_button'
+  %h1.realms Realms
diff --git a/src/app/views/realms/edit.html.haml b/src/app/views/realms/edit.html.haml
index 3f613a5..b051543 100644
--- a/src/app/views/realms/edit.html.haml
+++ b/src/app/views/realms/edit.html.haml
@@ -1,16 +1,16 @@
 = render :partial => 'layouts/admin_nav'
 
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @title
+%header.page-header
   #obj_actions.button-container
     = link_to t('realms.new_realm'), new_realm_url, :class => 'button primary', :id => 'new_user_button'
     %div.button-group
       = link_to t('realms.edit.cancel_editing'), realm_path(@realm), :class => 'button pill danger', :id => 'new_user_button'
+  %h1.realms= @title
 
-%section.admin-content-section.realm
+%section.content-section.realm
   %header
     %h2= t'realms.edit.properties'
 
   .content
-    = form_for @realm, :url => realm_path(@realm), :html => { :method => :put, :class => 'generic' } do |f|
+    = form_for @realm, :url => realm_path(@realm), :html => { :method => :put, :class => 'generic horizontal' } do |f|
       = render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/realms/new.html.haml b/src/app/views/realms/new.html.haml
index 28cecae..990b07c 100644
--- a/src/app/views/realms/new.html.haml
+++ b/src/app/views/realms/new.html.haml
@@ -1,12 +1,12 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1= t 'realms.new.create_realm'
+%header.page-header
   #obj_actions
     .return_to
       =t'return_to'
       = link_to t('realms.realms'), realms_path
+  %h1.realms= t 'realms.new.create_realm'
 
-%section.admin-content-section.users
+%section.content-section.users
   .content
-    = form_for @realm, :url => realms_path, :html => {:class => 'generic'} do |f|
+    = form_for @realm, :url => realms_path, :html => {:class => 'generic horizontal'} do |f|
       = render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/realms/show.html.haml b/src/app/views/realms/show.html.haml
index 133731f..b0f8b44 100644
--- a/src/app/views/realms/show.html.haml
+++ b/src/app/views/realms/show.html.haml
@@ -1,6 +1,5 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @title
+%header.page-header
   #obj_actions.button-container
     .return_to
       =t'return_to'
@@ -11,15 +10,16 @@
       - if check_privilege(Privilege::MODIFY, Realm)
         = link_to t('edit'), edit_realm_path(@realm), :class => 'button pill', :id => 'edit_realm_button'
         = button_to t('delete'), realm_path(@realm), :method => :delete, :confirm => t("realms.show.sure_to_delete"), :class => 'button pill danger', :id => 'delete_realm_button'
+  %h1.realms= @title
 
-%section.admin-content-section.realm
+%section.content-section.realm
   %header
     %h2= t'realms.show.properties'
 
   .content
     = render :partial => 'properties'
 
-%section.admin-content-section.realm_mapping
+%section.content-section.realm_mapping
   %header
     %h2= t'realms.show.realm_mapping'
 
diff --git a/src/app/views/roles/_list.html.haml b/src/app/views/roles/_list.html.haml
index 6ffed7b..cabbe11 100644
--- a/src/app/views/roles/_list.html.haml
+++ b/src/app/views/roles/_list.html.haml
@@ -1,4 +1,4 @@
-%section.admin-content-section.roles
+%section.content-section.roles
   %header
     %h2= t 'roles.list.roles_list'
 
diff --git a/src/app/views/roles/_section_header.html.haml b/src/app/views/roles/_section_header.html.haml
index 0f2190f..c1b2ae5 100644
--- a/src/app/views/roles/_section_header.html.haml
+++ b/src/app/views/roles/_section_header.html.haml
@@ -1,4 +1,4 @@
-%header.admin-page-header
-  %h1{:class => controller.controller_name} Roles
+%header.page-header
   #obj_actions.button-group
     = link_to t('roles.new_role'), new_role_url, :class => 'button primary', :id => 'new_role_button'
+  %h1.no-icon Roles
diff --git a/src/app/views/roles/edit.html.haml b/src/app/views/roles/edit.html.haml
index 554c347..d3c175d 100644
--- a/src/app/views/roles/edit.html.haml
+++ b/src/app/views/roles/edit.html.haml
@@ -1,12 +1,12 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @role.name.titlecase
+%header.page-header
   #obj_actions.button-container
     = link_to t('roles.new_role'), new_role_url, :class => 'button primary', :id => 'new_role_button'
     %div.button-group
       = link_to t('roles.edit.cancel_editing'), role_path(@role), :class => 'button pill danger', :id => 'new_role_button'
+  %h1.no-icon= @role.name.titlecase
 
-%section.admin-content-section.role
+%section.content-section.role
   %header
     %h2=t'roles.edit.properties'
 
@@ -16,5 +16,5 @@
     - else
       %h2=t('roles.edit.editing_role')
 
-    = form_for @role, :url => role_path(@role), :html => { :method => :put, :class => 'generic' } do |f|
+    = form_for @role, :url => role_path(@role), :html => { :method => :put, :class => 'generic horizontal' } do |f|
       = render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/roles/new.html.haml b/src/app/views/roles/new.html.haml
index b5d988f..d395496 100644
--- a/src/app/views/roles/new.html.haml
+++ b/src/app/views/roles/new.html.haml
@@ -1,9 +1,9 @@
 = render :partial => 'layouts/admin_nav'
 = render :partial => 'section_header'
-%section.admin-content-section.users
+%section.content-section.users
   %header
     %h2=t'roles.new_role'
 
   .content
-    = form_for @role, :url => roles_path, :html => {:class => 'generic'} do |f|
+    = form_for @role, :url => roles_path, :html => {:class => 'generic horizontal'} do |f|
       = render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/roles/show.html.haml b/src/app/views/roles/show.html.haml
index a6c691e..98b61b5 100644
--- a/src/app/views/roles/show.html.haml
+++ b/src/app/views/roles/show.html.haml
@@ -1,14 +1,14 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1{:class => controller.controller_name}= @role.name
+%header.page-header
   #obj_actions.button-container
     = link_to t('roles.new_role'), new_role_url, :class => 'button primary', :id => 'new_role_button'
     .button-group
       = link_to t('edit'), edit_role_path(@role), :class => 'button pill'
       = button_to t('delete'), role_path(@role), :method => :delete, :class => 'button pill danger',
         :confirm => t('roles.show.sure_to_delete')
+  %h1.no-icon= @role.name
 
-%section.admin-content-section.role
+%section.content-section.role
   %header
     %h2= t'roles.show.properties'
 
diff --git a/src/app/views/settings/_section_header.html.haml b/src/app/views/settings/_section_header.html.haml
index 2847d97..325996e 100644
--- a/src/app/views/settings/_section_header.html.haml
+++ b/src/app/views/settings/_section_header.html.haml
@@ -1,3 +1,2 @@
-%header.admin-page-header
-  %h1{:class => controller.controller_name}=t 'settings.settings'
-  #obj_actions.button-group
+%header.page-header
+  %h1.settings=t 'settings.settings'
diff --git a/src/app/views/settings/index.html.haml b/src/app/views/settings/index.html.haml
index 7facec7..2e7761f 100644
--- a/src/app/views/settings/index.html.haml
+++ b/src/app/views/settings/index.html.haml
@@ -1,7 +1,7 @@
 = render :partial => 'layouts/admin_nav'
 = render :partial => 'section_header'
 
-%section.admin-content-section.settings
+%section.content-section.settings
   .content
     %ul.tiles{:class => 'container_16'}
       - if check_privilege(Privilege::MODIFY)
diff --git a/src/app/views/settings/self_service.html.haml b/src/app/views/settings/self_service.html.haml
index 5cd97ef..c623896 100644
--- a/src/app/views/settings/self_service.html.haml
+++ b/src/app/views/settings/self_service.html.haml
@@ -1,24 +1,24 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1{:class => controller.controller_name}=t '.self_service_settings'
+%header.page-header
   #obj_actions.button-group
     .return_to
       = t 'return_to'
       = link_to "Settings", settings_path
+  %h1.settings=t '.self_service_settings'
 
-%section.admin-content-section
+%section.content-section
   %header
     %h2= t('.self_service_default')
 
   .content
-    = form_for @self_service_default_quota, :url => { :action => 'update' }, :html => { :class => 'generic' } do |form|
+    = form_for @self_service_default_quota, :url => { :action => 'update' }, :html => { :class => 'generic horizontal' } do |form|
       - if @self_service_default_quota.errors.any?
         = render 'layouts/error_messages', :object => @self_service_default_quota
       %fieldset
         = hidden_field :self_service_default_quota,  :id
-        %p
-        %label= t('.instances_quota')
-        = text_field :self_service_default_quota, :maximum_running_instances, :class => 'grid_5'
+        .field
+          %label= t('.instances_quota')
+          = text_field :self_service_default_quota, :maximum_running_instances, :class => 'grid_5'
       %fieldset.options
         #obj_actions.button-group
           = link_to t('reset'), self_service_settings_path, :class => 'button pill'
diff --git a/src/app/views/users/_form.html.haml b/src/app/views/users/_form.html.haml
index 825a1c9..9ac1a80 100644
--- a/src/app/views/users/_form.html.haml
+++ b/src/app/views/users/_form.html.haml
@@ -2,42 +2,50 @@
   = render 'layouts/error_messages', :object => @user
 
 %fieldset
-  %p.clearfix
+  .field
     = form.label :first_name
-    = form.text_field :first_name, :class =>"check_change"
-  %p.clearfix
+    .input
+      = form.text_field :first_name, :class =>"check_change"
+  .field
     = form.label :last_name
-    = form.text_field :last_name, :class =>"check_change"
-  %p.clearfix
+    .input
+      = form.text_field :last_name, :class =>"check_change"
+  .field
     = form.label :email, t(:email), :required => true
-    = form.text_field :email, :class =>"check_change"
+    .input
+      = form.text_field :email, :class =>"check_change"
 %fieldset
-  %p.clearfix
+  .field
     = form.label :login, t(:choose_name), :required => true
-    = form.text_field :login, :class => "em check_change"
-  %p.clearfix
+    .input
+      = form.text_field :login, :class => "check_change"
+  .field
     = form.label :password, form.object.new_record? ? t(:choose_password) : t(:change_password), :required => form.object.new_record?
-    = form.password_field :password
-  %p.clearfix
+    .input
+      = form.password_field :password
+  .field
     = form.label :password_confirmation, t(:confirm_password), :required => form.object.new_record?
-    = form.password_field :password_confirmation
+    .input
+      = form.password_field :password_confirmation
 
 - if check_privilege(Privilege::MODIFY, User)
   %fieldset
     = form.fields_for :quota do |quota_form|
-      %p.clearfix
+      .field
         = quota_form.label :maximum_running_instances, t(:maximum_running_instances)
-        = quota_form.text_field :maximum_running_instances
+        .input
+          = quota_form.text_field :maximum_running_instances
 
   %fieldset
     %legend=t'users.form.user_status'
-    %ul.radio-group
-      %li
-        = label_tag "user_status_active", t("users.form.user_status_active")
-        = radio_button_tag "user_status", t("users.form.user_status_active"), true
-      %li
-        = label_tag "user_status_inactive", t("users.form.user_status_inactive")
-        = radio_button_tag "user_status", t("users.form.user_status_inactive"), false, :disabled => true
+    .field
+      %ul.radio-group
+        %li
+          = label_tag "user_status_active", t("users.form.user_status_active")
+          = radio_button_tag "user_status", t("users.form.user_status_active"), true
+        %li
+          = label_tag "user_status_inactive", t("users.form.user_status_inactive")
+          = radio_button_tag "user_status", t("users.form.user_status_inactive"), false, :disabled => true
 
 %fieldset.options
   = form.submit "#{t'users.form.save_user'}",  :class => "submit button pill"
diff --git a/src/app/views/users/_section_header.html.haml b/src/app/views/users/_section_header.html.haml
index 0744b50..73a64a1 100644
--- a/src/app/views/users/_section_header.html.haml
+++ b/src/app/views/users/_section_header.html.haml
@@ -1,8 +1,7 @@
-%header.admin-page-header
+%header.page-header
   #obj_actions
     .return_to
       =t'users.quick_jump'
       = link_to 'Groups', "#groups"
       = link_to 'Users', "#users"
-      = link_to 'Roles', "#roles"
-  .clear
+      = link_to 'Roles', "#roles"
\ No newline at end of file
diff --git a/src/app/views/users/edit.html.haml b/src/app/views/users/edit.html.haml
index 6b3064b..619bf93 100644
--- a/src/app/views/users/edit.html.haml
+++ b/src/app/views/users/edit.html.haml
@@ -1,15 +1,15 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  - if check_privilege(Privilege::MODIFY, User)
-    %h1.users= @title
-  - else
-    %h1.users=t'users.edit.edit_account'
+%header.page-header
   #obj_actions
     .return_to
       =t'users.return_to'
       = link_to "#{t'users.users'}", users_path
+  - if check_privilege(Privilege::MODIFY, User)
+    %h1.users= @title
+  - else
+    %h1.users=t'users.edit.edit_account'
 
-%section.admin-content-section.user
+%section.content-section.user
   .content
     #user_card.user_form_card
       %header.user-card-header
@@ -22,5 +22,5 @@
           %dd#email= @user.email
           %dt=t'users.show.username'
           %dd#login= @user.login
-    = form_for @user, :url => user_path(@user), :builder => ApplicationHelper::FormBuilderWithRequiredFields, :html => { :method => :put, :class => 'generic' } do |f|
+    = form_for @user, :url => user_path(@user), :builder => ApplicationHelper::FormBuilderWithRequiredFields, :html => { :method => :put, :class => 'generic horizontal' } do |f|
       = render :partial => "form", :locals => { :form => f, :cancel_path => users_path }
diff --git a/src/app/views/users/new.html.haml b/src/app/views/users/new.html.haml
index 93417f3..f6e1ce7 100644
--- a/src/app/views/users/new.html.haml
+++ b/src/app/views/users/new.html.haml
@@ -1,12 +1,12 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
-  %h1.users= @title
+%header.page-header
   #obj_actions
     .return_to
       =t'return_to'
       = link_to "#{t'users.users'}", users_path
+  %h1.users= @title
 
-%section.admin-content-section.users
+%section.content-section.users
   .content
     .align-center
       %p.description
@@ -22,7 +22,7 @@
           %dd#email &nbsp;
           %dt=t'users.show.username'
           %dd#login &nbsp;
-    = form_for @user, :url => users_path, :builder => ApplicationHelper::FormBuilderWithRequiredFields, :html => {:class => 'generic'} do |f|
+    = form_for @user, :url => users_path, :builder => ApplicationHelper::FormBuilderWithRequiredFields, :html => {:class => 'generic horizontal'} do |f|
       -if current_user
         = render :partial => "form", :locals => { :form => f }
       -else
diff --git a/src/app/views/users/show.html.haml b/src/app/views/users/show.html.haml
index a66175f..16a7118 100644
--- a/src/app/views/users/show.html.haml
+++ b/src/app/views/users/show.html.haml
@@ -1,12 +1,12 @@
 = render :partial => 'layouts/admin_nav'
-%header.admin-page-header
+%header.page-header
   - if check_privilege(Privilege::VIEW, User)
     #obj_actions
       .return_to
         =t'return_to'
         = link_to t('users.users'), users_path
 
-%section.admin-content-section.user
+%section.content-section.user
   .content
     #user_card.user_stats_card
       %header.user-card-header
@@ -46,14 +46,14 @@
             %dd= @user.last_login_ip
   .clear
 
-/%section.admin-content-section.user
+/%section.content-section.user
 /  %header
 /    %h2.activity Activity
 /
 /  .content
 /    Unimplemented.
 /
-/%section.admin-content-section.user
+/%section.content-section.user
 /  %header
 /    %h2.roles Roles &amp; Permissions
 /
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index a3044ad..f6d3623 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -833,6 +833,7 @@ en:
       edit_file: "Edit this file before saving:"
     edit_xml:
       edit: Edit
+      edit_xml: Edit XML
       save_and_continue: Save and Continue
     overview:
       valid_image: Valid Image
diff --git a/src/public/images/administer_nav_bg.png b/src/public/images/administer_nav_bg.png
deleted file mode 100644
index 493dd6528c138ed95872a5514a9342f096474a11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2008
zcmaJ?eN<ED9gfN<VqvffLP2&7$0Adbn?wQ$M92qVgn$AqnLx`Wxj=;68<HE6Ks|su
zCu>F#v<)BPk=nY|B3~A$z=%LWCLgv4%12O%gHe!y3PFXr8!L8yjJ at aF`@X;TJkRs{
zJm<|j7#?C{{jN2EK(OKO=SAZCR{RUMvc&&D8NCeOoUtGw7KJ8ZDo73!*kUvh2KZ7a
z8IFV at u_nD6_9qZF5hc+=OehFricl#DGGj<;sSIZm2>t<T86--DF(466mLM$RznWT!
zfJDq9#&`=rfs6~MNcLyS;i$~;Xi;XWh#@8h>;wGOOk6+;V-TR0rXdQZnnir2%f!#-
zYcdgd1;J8T#Giu_3JwBXR1O2)B+yF)(m{YuAyH_1eSCcO0923yl0hn&LiM8fFlkgK
z2m-Gc5%(q+Cov;=!LNPc7K at mIVKOF}tWv2+DjEruCzB}*2E(jDrF!8AFNFrdAhj2w
za9>m4!3vRFBEuvo0+<z{L{y2fh<Kzwry!NRkwp}*%Y+w<tcGM{3JEl)v<4Ii{y$VI
zeS=nDk?=3^{!d{=v_=M#BVh%ql#B4jCAphj$(UR at 3}L7|8b#CAs(3I3#ZW~GDg(Gt
z-hcoSNf5LB3NH{a`G^985E0Dhv52?=Ng@$585}w-n9AdDxr|^6B?x4A`v!B_bP%Kl
zd$W05>Kd1aij-0q!PdCqU%1?Lx#m%j%5cv-ST4zc#ldn^3cO00DOo=j#=3g1x#IO>
zVXw<2<H3;4js34iuU+BOV?MqaTikdv_%MP`yBr^D#g6%D0>L7T&tpfcM`m at Q@=?%^
z=jmi>)m9lxZ`4l&PhW8J!{`gdPpS_Dowk at 79iZKRgs+8X&os@=&90wz85<2qNPd~3
zx2{a_(7)5y_wh at kQFQJ}U(flKTF^&LX|pTK8tYdMO=&FBA7*d;)MPR(7W~Sp?Qm?j
zw<%4Mf1^aBuV_B;OvtsGGreFY3qHhBW`|dp^-ryCDr0N*W*fScTPGYiF}`xzNV+F^
zDkQE(tA<(7gd3&z`LzDA-4lju4Ce`k2DGp8N4C4Cs<d{FTQozboW at Soj{%;IHKHd<
z!H;U^(4%2gOIw at syV$vgNo`_#T47L+N4^!R+Po#NZTI+jl244 at q3<u2h3)+du9o$`
zy_P977C1fi$hAe at At1kr*vfJ2_~C<o`mlOa$9CJqx988TPFn+)Ek=qhE`?hT9V(g8
z0?9hHeE=}HxkfgAE(IMDjxFuswuWi#InAeQ3ORb8&&qoedk(Dx=dwm1Ztdk9UfiL5
z!oBp(U585pgbN<mJBmP=6l#i;Z7VnK<UnjvXx8<`j)%yBKI$$|_vm-kzwa;cjsMeo
zBa<Nw)>cWm<A>9ock_c^Mi6TX)L(y}AJzH~P&4tjqN!UQBL>G)1_ze2O5Ea-?ViwB
z9Ch=n-E{?{JB71J^qwK)@s$__G!(L7VeSVwCtyz?+v6=Zt3rR^n{ye1C$5F^b+m%s
zgO}LW0+L at ->gRb?-4!mwvOCnO;<wUIFSmgoTzesp*mR50c;c^qUnEJ+>?>l1lSJ1&
z6}3044fE+ovC7Vh%i7Ggww!O;n+(~R)q6Edz|{*oPMV(9pXjV8x2U$=m2Ox)?(4 at J
zh}wt*R&?qv{7AbPs`~g&T1nd&Vn5W91rO(}A{h5VX-mV7$#zXpl$G+M`u8&iUB63q
z at o`Ida9H`RPW{N?ZkcZG`oM8}vAybx4#WkC?R$R|<2DqwtY*HqA@|G!x1hjlCXba&
z$64Ed+T0rPT at 1V1+pLO?pX%K-&@vcb6|0w!D?U4tyW3MxcAM%na}=XBjZXK;P4~x-
z74OnondS%5jGc3bI__SLZShvbN7Pl<{Un(=vSsYHr9OFEi*Zs;`-u9?M0goZk2v<O
zHS2bhU2VBZHLZNxCSgx=?G5e*$16utzm_Xhi6!xIUP~#BxBW-eQ+XTDIDH~Cxg2G*
zlhl8&>|Xk5AZ#e2$D=W4X!VX?)<nj}x-R2fB|k7WA at GGW!6UBe((+8<%-QsYx~%Vu
z{7x234(et~g7y!TE;Px8?^XFPJui>_!=J&6OMe91o*ysv8UM;7yZ-UXxFAZnX#Q+$
ze&wCIh^uW6wzp(mX${cjJ%90e|4q9FLf4m-GbiuO3bqvg8-Vm5F2)t*GHz-2^=K at Q
z5az!7GUOeTgFAG;wUsh|ueY1OU}-p8XZ>JtadElZnDMRma;eBQ;Nz8T%fGf>*{LVk
WUxdJ(l=H{UZ!JG4oOgwjaO^*1FH;Wy

-- 
1.7.7.6




More information about the aeolus-devel mailing list