diff --git a/app/ContainerDetails.react.js b/app/ContainerDetails.react.js
index 7ec8d63921..0ff5a53c21 100644
--- a/app/ContainerDetails.react.js
+++ b/app/ContainerDetails.react.js
@@ -504,7 +504,7 @@ var ContainerDetails = React.createClass({
     return (
       <div className="details">
         <div className="details-header">
-          <h1>{this.props.container.Name}</h1><h2 className="image">{this.props.container.Config.Image}</h2>
+          <h1>{this.props.container.Name}</h1>{state}
           <div className="details-header-actions">
             <span className="icon icon-preview-2 action-icon view-icon" onClick={this.handleView}></span>
             <span className="icon icon-refresh action-icon" onClick={this.handleRestart}></span>
@@ -512,7 +512,7 @@ var ContainerDetails = React.createClass({
           </div>
         </div>
         <div className="details-subheader">
-          {state}
+          <span className="image">{this.props.container.Config.Image}</span>
           <div className="details-subheader-tabs">
             <span className={tabLogsClasses} onClick={this.showLogs}>Logs</span>
             <span className={tabPortsClasses} onClick={this.showPorts}>Ports</span>
diff --git a/app/styles/containers.less b/app/styles/containers.less
index 5a99f0eb41..a1feea273b 100644
--- a/app/styles/containers.less
+++ b/app/styles/containers.less
@@ -84,7 +84,7 @@
       .sidebar-containers {
         position: relative;
         flex: 1 auto;
-        overflow-y: scroll;
+        overflow-y: auto;
         overflow-x: hidden;
         box-sizing: border-box;
         max-width: 260px;
@@ -310,23 +310,19 @@
         border-bottom: 1px solid @gray-lightest;
         background-color: white;
         height: 32px;
-        padding: 8px 10px 10px 24px;
-        font-size: 12px;
+        padding: 7px 10px 10px 24px;
+        font-size: 13px;
         color: @gray-normal;
-        .status {
-          font-weight: 500;
-          position: relative;
-          top: -2px;
-          &.running {
-            color: @brand-positive;
-          }
-          &.paused {
-            color: @gray-lighter;
-          }
-          &.stopped {
-            color: @gray-lighter;
-          }
+
+        .image {
+          flex: 1 auto;
+          //margin: 7px 0px 0px 16px;
+          margin-top: 1px;
+          font-size: 13px;
+          color: @gray-normal;
+          //font-weight: 300;
         }
+
         .details-subheader-tabs {
           flex: 1 auto;
           text-align: right;
@@ -335,6 +331,7 @@
             margin-left: 20px;
             padding: 3px 10px;
             transition: all 0.25s;
+            font-weight: 500;
             &:hover {
               color: @brand-action;
             }
@@ -363,21 +360,20 @@
           margin: 0;
           color: @gray-darkest;
         }
-        h2 {
-          &.status {
-            margin: 9px 0px 0px 12px;
-            font-weight: bold;
-            font-size: 10px;
-            &.running {
-              color: @brand-positive;
-            }
+        .status {
+          font-size: 10px;
+          font-weight: 500;
+          position: relative;
+          top: 8px;
+          left: 14px;
+          &.running {
+            color: @brand-positive;
           }
-          &.image {
-            flex: 1 auto;
-            margin: 7px 0px 0px 16px;
-            font-size: 12px;
-            color: @gray-normal;
-            font-weight: 300;
+          &.paused {
+            color: @gray-lighter;
+          }
+          &.stopped {
+            color: @gray-lighter;
           }
         }
 
@@ -440,7 +436,7 @@
           -webkit-user-select: text;
           font-family: Menlo;
           font-size: 12px;
-          padding: 20px 20px;
+          padding: 20px 18px;
           color: lighten(@gray-normal, 6%);
           white-space: pre-wrap;
           p {
diff --git a/app/styles/theme.less b/app/styles/theme.less
index 24bfbcac50..801df30911 100644
--- a/app/styles/theme.less
+++ b/app/styles/theme.less
@@ -13,7 +13,7 @@ h3 {
 h4 {
   font-size: 13px;
   color: @gray-darker;
-  font-weight: 400;
+  font-weight: 500;
 }
 
 .popover-content {