diff --git a/public/app/features/datasources/partials/edit.html b/public/app/features/datasources/partials/edit.html
index 3dd3e8fdc0b..f442d3e7f35 100644
--- a/public/app/features/datasources/partials/edit.html
+++ b/public/app/features/datasources/partials/edit.html
@@ -64,9 +64,9 @@
 			</div>
 
 			<div class="" style="margin-top: 35px">
-				<button type="submit" class="btn btn-large btn-success" ng-show="isNew" ng-click="saveChanges()">Add</button>
-				<button type="submit" class="btn btn-large btn-success" ng-show="!isNew" ng-click="saveChanges()">Save</button>
-				<button type="submit" class="btn btn-large btn-inverse" ng-show="!isNew" ng-click="saveChanges(true)">
+				<button type="submit" class="btn btn-success" ng-show="isNew" ng-click="saveChanges()">Add</button>
+				<button type="submit" class="btn btn-success" ng-show="!isNew" ng-click="saveChanges()">Save</button>
+				<button type="submit" class="btn btn-inverse" ng-show="!isNew" ng-click="saveChanges(true)">
 					Test Connection
 				</button>
 				<a class="btnText" href="datasources">Cancel</a>
diff --git a/public/less/gfbox.less b/public/less/gfbox.less
index 94b90d462c0..16660f18a54 100644
--- a/public/less/gfbox.less
+++ b/public/less/gfbox.less
@@ -71,7 +71,10 @@
 .page-container {
   background-color: @pageBackground;
   position: relative;
-  padding: 25px 60px 60px 88px;
+  padding: 25px 56px;
+  min-height: 900px;
+  max-width: 1060px;
+  margin-left: 0;
 }
 
 
@@ -90,7 +93,7 @@
   flex-wrap: wrap-reverse;
 }
 .page-wide {
-  max-width: 1000px;
+  max-width: 1060px;
 }
 
 .page-wide-margined {
diff --git a/public/less/grafana.less b/public/less/grafana.less
index 11bba793b43..561027ca75c 100644
--- a/public/less/grafana.less
+++ b/public/less/grafana.less
@@ -29,7 +29,8 @@
 @import "filter-table.less";
 @import "simple-box.less";
 @import "dropdown.less";
-@import url(https://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic|PT+Sans+Caption:400,700);
+// @import url(https://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic|PT+Sans+Caption:400,700);
+@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,300,400italic,600,700);
 
 .row-control-inner {
   padding:0px;
diff --git a/public/less/navbar.less b/public/less/navbar.less
index a429adea224..25b450910b6 100644
--- a/public/less/navbar.less
+++ b/public/less/navbar.less
@@ -81,7 +81,7 @@
     overflow: hidden;
     white-space: nowrap;
     display: block;
-    padding: 16px 17px 15px 13px;
+    padding: 16px 17px 16px 13px;
   }
 
   .fa-th-large {
diff --git a/public/less/normform.less b/public/less/normform.less
index 30a687df555..7ceab67fa48 100644
--- a/public/less/normform.less
+++ b/public/less/normform.less
@@ -157,7 +157,7 @@ input[type=text].norm-form-clear-input {
     padding: 8px 6px;
     height: 100%;
     box-sizing: border-box;
-    font-size: 16px;
+    font-size: 15px;
     &.last {
       border-right: none;
     }
@@ -181,7 +181,7 @@ select.norm-form-input {
   border-radius: 0;
   height: 36px;
   padding: 9px 3px;    
-  font-size: 16px;
+  font-size: 15px;
   &.last {
     border-right: none;
   }
diff --git a/public/less/sidemenu.less b/public/less/sidemenu.less
index 56352528f7b..9a71946b517 100644
--- a/public/less/sidemenu.less
+++ b/public/less/sidemenu.less
@@ -6,13 +6,13 @@
   position: absolute;
   top: 52px;
   left: 0;
-  width: 200px;
-  background-color: @sideMenuBackground;
+  width: 220px;
+  background-color: @bodyBackground;
   border: @sideMenuBorder;
   z-index: 101;
   transform: translate3d(0, -100%, 0);
   visibility: hidden;
-  box-shadow: @sideMenuShadow;
+  // box-shadow: @sideMenuShadow;
 
   a:focus {
     text-decoration: none;
@@ -35,13 +35,13 @@
     padding-left: 210px;
   }
   .page-container {
-    margin-left: 190px;
-    padding-left: 55px;
+    margin-left: 195px;
+    padding-left: 77px;
   }
   .top-nav-menu-btn {
     a {
       background-color: @sideMenuBackground;
-      padding-right: 46px;
+      padding-right: 67px;
       padding-left: 24px;
     }
     .icon-gf-grafana_wordmark  {
@@ -207,7 +207,7 @@
 .sidemenu-org .fa-caret-right {
   position: absolute;
   top: 50%;
-  right: 4px;
+  right: 25px;
   font-size: 80%;
   color: @linkColor;
 }
diff --git a/public/less/variables.dark.less b/public/less/variables.dark.less
index 4e8ba2c28d7..715aa4f2660 100644
--- a/public/less/variables.dark.less
+++ b/public/less/variables.dark.less
@@ -34,7 +34,7 @@
 // grafana Variables
 // -------------------------
 @grafanaPanelBackground: 	@grayDarker;
-@grafanaPanelBorder: 		  solid 1px @grayDark;
+@grafanaPanelBorder: 		solid 1px @grayDark;
 @grafanaTriggerBorder:		solid 1px #555;
 
 // Graphite Target Editor
@@ -54,9 +54,8 @@
 
 // Scaffolding
 // -------------------------
-// @bodyBackground:  rgb(20,20,20);
+@bodyBackground:  rgb(20,20,20);
 @pageBackground:  @grayDarker;
-@bodyBackground:  @pageBackground;
 @textColor:       @grayLighter;
 
 // Links
@@ -68,11 +67,11 @@
 
 // Typography
 // -------------------------
-@sansFontFamily:        "PT Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+@sansFontFamily:        "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 @serifFontFamily:       Georgia, "Times New Roman", Times, serif;
 @monoFontFamily:        Menlo, Monaco, Consolas, "Courier New", monospace;
 
-@baseFontSize:          14px;
+@baseFontSize:          13px;
 @baseFontWeight:		400;
 @baseFontFamily:        @sansFontFamily;
 @baseLineHeight:        20px;
@@ -80,7 +79,7 @@
 
 @headingsFontFamily:    inherit; // empty to use BS default, @baseFontFamily
 @headingsFontWeight:    200;    // instead of browser default, bold
-@headingsFontStyle:    	italic; 
+@headingsFontStyle:    	normal; 
 @headingsColor:         darken(@white,11%); // empty to use BS default, @textColor
 @inputText:             @black;