diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 8556dcf2994..4b4f6fe8597 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -283,7 +283,7 @@ func GetDashboardVersions(c *middleware.Context) Response {
 
 	for _, version := range query.Result {
 		if version.RestoredFrom == version.Version {
-			version.Message = "Initial save (created migration)"
+			version.Message = "Initial save (created by migration)"
 			continue
 		}
 
diff --git a/public/app/features/dashboard/history/history.html b/public/app/features/dashboard/history/history.html
index 415bb3b794f..53d960fd620 100644
--- a/public/app/features/dashboard/history/history.html
+++ b/public/app/features/dashboard/history/history.html
@@ -78,7 +78,7 @@
         <div class="gf-form-group" ng-show="ctrl.mode === 'list'">
           <div class="gf-form-button-row">
             <a	type="button"
-                class="btn gf-form-button btn-primary"
+                class="btn gf-form-button btn-secondary"
                 ng-if="ctrl.revisions.length > 1"
                 ng-class="{disabled: !ctrl.isComparable()}"
                 ng-click="ctrl.getDiff(ctrl.diff)"
@@ -99,58 +99,52 @@
 		</div>
 	</div>
 
-	<div class="history-list" ng-if="ctrl.mode === 'compare'">
-		<div class="page-container">
-			<div class="page-body">
-				<aside class="page-sidebar">
-					<section class="page-sidebar-section">
-						<ul class="ui-list">
-							<li><a ng-class="{active: ctrl.diff === 'basic'}" ng-click="ctrl.getDiff('basic')" href="">Change Summary</a></li>
-							<li><a ng-class="{active: ctrl.diff === 'html'}" ng-click="ctrl.getDiff('html')" href="">JSON Code View</a></li>
-						</ul>
-					</section>
-				</aside>
+	<div class="edit-tab-with-sidemenu" ng-if="ctrl.mode === 'compare'">
+    <aside class="edit-sidemenu-aside">
+      <ul class="edit-sidemenu">
+        <li ng-class="{active: ctrl.diff === 'basic'}"><a ng-click="ctrl.getDiff('basic')" href="">Change Summary</a></li>
+        <li ng-class="{active: ctrl.diff === 'html'}"><a ng-click="ctrl.getDiff('html')" href="">JSON Code View</a></li>
+      </ul>
+    </aside>
 
-				<div class="tab-content page-content-with-sidebar">
-					<div ng-if="ctrl.loading">
-						<i class="fa fa-spinner fa-spin"></i>
-						<em>Fetching changes&hellip;</em>
-					</div>
+    <div class="edit-tab-content">
+      <div ng-if="ctrl.loading">
+        <i class="fa fa-spinner fa-spin"></i>
+        <em>Fetching changes&hellip;</em>
+      </div>
 
-					<div ng-if="!ctrl.loading" ng-init="new = ctrl.selected[0]; original = ctrl.selected[1]">
-						<a  type="button"
-								class="btn gf-form-button btn-primary diff-restore-btn"
-								ng-click="ctrl.restore(new)"
-								ng-if="ctrl.isOriginalCurrent()">
-							<i class="fa fa-rotate-right" ></i>&nbsp;&nbsp;Restore to version {{new}}
-						</a>
-						<h4>
-							Comparing Version {{ctrl.selected[0]}}
-							<i class="fa fa-arrows-h"></i>
-							Version {{ctrl.selected[1]}}
-							<cite class="muted" ng-if="ctrl.isOriginalCurrent()">(Current)</cite>
-						</h4>
-						<section ng-if="ctrl.diff === 'basic'">
-							<p class="small muted">
-							<strong>Version {{new}}</strong> updated by
-							<span>{{ctrl.getMeta(new, 'createdBy')}} </span>
-							<span>{{ctrl.formatBasicDate(ctrl.getMeta(new, 'created'))}}</span>
-							<span> - {{ctrl.getMeta(new, 'message')}}</span>
-							</p>
-							<p class="small muted">
-							<strong>Version {{original}}</strong> updated by
-							<span>{{ctrl.getMeta(original, 'createdBy')}} </span>
-							<span>{{ctrl.formatBasicDate(ctrl.getMeta(original, 'created'))}}</span>
-							<span> - {{ctrl.getMeta(original, 'message')}}</span>
-							</p>
-						</section>
-						<div id="delta" diff-delta>
-							<div class="delta-basic" ng-show="ctrl.diff === 'basic'" compile="ctrl.delta.basic"></div>
-							<div class="delta-html" ng-show="ctrl.diff === 'html'" compile="ctrl.delta.html"></div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+      <div ng-if="!ctrl.loading" ng-init="new = ctrl.selected[0]; original = ctrl.selected[1]">
+        <a  type="button"
+            class="btn gf-form-button btn-secondary pull-right"
+            ng-click="ctrl.restore(new)"
+            ng-if="ctrl.isOriginalCurrent()">
+          <i class="fa fa-rotate-right" ></i>&nbsp;&nbsp;Restore to version {{new}}
+        </a>
+        <h4>
+          Comparing Version {{ctrl.selected[0]}}
+          <i class="fa fa-arrows-h"></i>
+          Version {{ctrl.selected[1]}}
+          <cite class="muted" ng-if="ctrl.isOriginalCurrent()">(Current)</cite>
+        </h4>
+        <section ng-if="ctrl.diff === 'basic'">
+          <p class="small muted">
+          <strong>Version {{new}}</strong> updated by
+          <span>{{ctrl.getMeta(new, 'createdBy')}} </span>
+          <span>{{ctrl.formatBasicDate(ctrl.getMeta(new, 'created'))}}</span>
+          <span> - {{ctrl.getMeta(new, 'message')}}</span>
+          </p>
+          <p class="small muted">
+          <strong>Version {{original}}</strong> updated by
+          <span>{{ctrl.getMeta(original, 'createdBy')}} </span>
+          <span>{{ctrl.formatBasicDate(ctrl.getMeta(original, 'created'))}}</span>
+          <span> - {{ctrl.getMeta(original, 'message')}}</span>
+          </p>
+        </section>
+        <div id="delta" diff-delta>
+          <div class="delta-basic" ng-show="ctrl.diff === 'basic'" compile="ctrl.delta.basic"></div>
+          <div class="delta-html" ng-show="ctrl.diff === 'html'" compile="ctrl.delta.html"></div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 90366da6087..cedaf096988 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -286,9 +286,6 @@ $footer-link-hover:   $gray-4;
 $diff-label-bg:         $dark-2;
 $diff-label-fg:         $white;
 
-$diff-switch-bg:        $dark-5;
-$diff-switch-disabled:  $gray-1;
-
 $diff-group-bg:         $dark-4;
 $diff-arrow-color:      $white;
 
diff --git a/public/sass/components/edit_sidemenu.scss b/public/sass/components/edit_sidemenu.scss
index 5da2f6a21ce..e84ae2c1914 100644
--- a/public/sass/components/edit_sidemenu.scss
+++ b/public/sass/components/edit_sidemenu.scss
@@ -10,7 +10,6 @@
 }
 
 .edit-sidemenu-aside {
-  min-width: 6rem;
   margin-right: $spacer*2;
 }
 
diff --git a/public/sass/pages/_history.scss b/public/sass/pages/_history.scss
index eb2ac4181ee..3637907fb1a 100644
--- a/public/sass/pages/_history.scss
+++ b/public/sass/pages/_history.scss
@@ -1,30 +1,3 @@
-
-// Diff View
-.history-list {
-  h4 {
-    margin-bottom: 0.75em;
-  }
-
-  .page-container {
-    padding: 0;
-    background: none;
-  }
-
-  .page-sidebar {
-    margin-left: 0;
-    margin-right: 3em;
-  }
-
-  .small.muted { margin-bottom: 0.25em; }
-
-  .ui-list > li  {
-    margin-bottom: 1.5em;
-
-    & > a { padding-left: 15px; }
-    & > a.active { @include left-brand-border-gradient(); }
-  }
-}
-
 // Actual Diff
 #delta {
   margin: 2em 0;
@@ -105,10 +78,6 @@
 
 .diff-item-added, .diff-item-deleted { list-style: none; }
 
-.diff-restore-btn {
-  float: right;
-}
-
 .diff-group {
   background: $diff-group-bg;
   font-size: 16px;