diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index 5df27e2c3fd..8fd2b34ae5a 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -116,15 +116,3 @@
 	</div>
 </div>
 
-<div class="clearfix"></div>
-</div>
-
-<div class="gf-box-footer">
-	<div class="grafana-version-info" ng-show="editor.index === 0">
-		<span class="editor-option small">
-			Grafana version: {{contextSrv.version}} &nbsp;&nbsp;
-		</span>
-		<span grafana-version-check>
-		</span>
-	</div>
-</div>
diff --git a/public/app/partials/help_modal.html b/public/app/partials/help_modal.html
index 9dfeb9bf2f8..2709d1d1748 100644
--- a/public/app/partials/help_modal.html
+++ b/public/app/partials/help_modal.html
@@ -1,16 +1,16 @@
-<div class="modal-body gf-box-no-margin">
-	<div class="gf-box-header">
-		<div class="gf-box-title">
+<div class="modal-body">
+	<div class="modal-header">
+		<h2 class="modal-header-title">
 			<i class="fa fa-keyboard-o"></i>
-			Keyboard shortcuts
-		</div>
+			<span class="p-l-1">Keyboard shortcuts</span>
+		</h2>
 
-		<button class="gf-box-header-close-btn" ng-click="dismiss();">
+		<a class="modal-header-close" ng-click="dismiss();">
 			<i class="fa fa-remove"></i>
-		</button>
+		</a>
 	</div>
 
-	<div class="gf-box-body">
+	<div class="modal-content">
 		<table class="shortcut-table">
 			<tr>
 				<th></th>