diff --git a/public/app/features/plugins/import_list/import_list.html b/public/app/features/plugins/import_list/import_list.html
index b8e6e13cf8c..ff655f0c33a 100644
--- a/public/app/features/plugins/import_list/import_list.html
+++ b/public/app/features/plugins/import_list/import_list.html
@@ -13,12 +13,6 @@
 						{{dash.title}}
 					</span>
 				</td>
-				<td>
-          <span>
-            Revision: {{dash.revision}}
-            <span ng-if="dash.imported" class="small">(Imported: {{dash.importedRevision}})</span>
-          <span>
-				</td>
 				<td style="text-align: right">
 					<button class="btn btn-secondary btn-small" ng-click="ctrl.import(dash, false)" ng-show="!dash.imported">
 						Import
diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index c879f74cfad..38ae83cd9d3 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -30,77 +30,79 @@
 
 <div class="page-container page-body">
 
-  <h3 class="page-sub-heading" ng-hide="ctrl.isNew">Edit Data Source</h3>
-  <h3 class="page-sub-heading" ng-show="ctrl.isNew">New Data Source</h3>
-
   <div ng-if="ctrl.current.readOnly"  class="page-action-bar">
     <div class="grafana-info-box span8">
       Disclaimer. This datasource was added by config and cannot be modified using the UI. Please contact your server admin to update this datasource.
     </div>
   </div>
 
-	<div ng-if="ctrl.tabIndex === 0">
-		<form name="ctrl.editForm" ng-if="ctrl.current">
-			<div class="gf-form-group">
-				<div class="gf-form-inline">
-					<div class="gf-form max-width-30">
-						<span class="gf-form-label width-7">Name</span>
-						<input class="gf-form-input max-width-23" type="text" ng-model="ctrl.current.name" placeholder="name" required>
-						<info-popover offset="0px -135px" mode="right-absolute">
-							The name is used when you select the data source in panels.
-							The <em>Default</em> data source is preselected in new
-							panels.
-						</info-popover>
-					</div>
-					<gf-form-switch class="gf-form" label="Default" checked="ctrl.current.isDefault" switch-class="max-width-6"></gf-form-switch>
-				</div>
+  <h3 class="page-sub-heading" ng-hide="ctrl.isNew">Edit Data Source</h3>
+  <h3 class="page-sub-heading" ng-show="ctrl.isNew">New Data Source</h3>
 
-				<div class="gf-form">
-					<span class="gf-form-label width-7">Type</span>
-					<div class="gf-form-select-wrapper max-width-23">
-						<select class="gf-form-input" ng-model="ctrl.current.type" ng-options="v.id as v.name for v in ctrl.types" ng-change="ctrl.userChangedType()"></select>
-					</div>
-				</div>
-			</div>
+  <form name="ctrl.editForm" ng-if="ctrl.current">
+    <div class="gf-form-group">
+      <div class="gf-form-inline">
+        <div class="gf-form max-width-30">
+          <span class="gf-form-label width-7">Name</span>
+          <input class="gf-form-input max-width-23" type="text" ng-model="ctrl.current.name" placeholder="name" required>
+          <info-popover offset="0px -135px" mode="right-absolute">
+            The name is used when you select the data source in panels.
+            The <em>Default</em> data source is preselected in new
+            panels.
+          </info-popover>
+        </div>
+        <gf-form-switch class="gf-form" label="Default" checked="ctrl.current.isDefault" switch-class="max-width-6"></gf-form-switch>
+      </div>
 
-			<div class="alert alert-info gf-form-group" ng-if="ctrl.datasourceMeta.state === 'alpha'">
-				This plugin is marked as being in alpha state, which means it is in early development phase and
-				updates will include breaking changes.
-			</div>
+      <div class="gf-form">
+        <span class="gf-form-label width-7">Type</span>
+        <div class="gf-form-select-wrapper max-width-23">
+          <select class="gf-form-input" ng-model="ctrl.current.type" ng-options="v.id as v.name for v in ctrl.types" ng-change="ctrl.userChangedType()"></select>
+        </div>
+      </div>
+    </div>
 
-			<rebuild-on-change property="ctrl.datasourceMeta.id">
-				<plugin-component type="datasource-config-ctrl">
-				</plugin-component>
-			</rebuild-on-change>
+    <div class="alert alert-info gf-form-group" ng-if="ctrl.datasourceMeta.state === 'alpha'">
+      This plugin is marked as being in alpha state, which means it is in early development phase and
+      updates will include breaking changes.
+    </div>
 
-			<div ng-if="ctrl.testing" class="gf-form-group section">
-				<h5 ng-show="!ctrl.testing.done">Testing.... <i class="fa fa-spiner fa-spin"></i></h5>
-				<div class="alert-{{ctrl.testing.status}} alert" ng-show="ctrl.testing.done">
-					<div class="alert-icon">
-						<i class="fa fa-exclamation-triangle" ng-show="ctrl.testing.status === 'error'"></i>
-						<i class="fa fa-check" ng-show="ctrl.testing.status !== 'error'"></i>
-					</div>
-					<div class="alert-body">
-						<div class="alert-title">{{ctrl.testing.message}}</div>
-					</div>
-				</div>
-			</div>
+    <rebuild-on-change property="ctrl.datasourceMeta.id">
+      <plugin-component type="datasource-config-ctrl">
+      </plugin-component>
+    </rebuild-on-change>
 
-			<div class="gf-form-button-row">
-				<button type="submit" class="btn btn-success" ng-disabled="ctrl.current.readOnly"  ng-click="ctrl.saveChanges()">Save</button>
-				<button type="submit" class="btn btn-danger" ng-disabled="ctrl.current.readOnly"  ng-show="!ctrl.isNew" ng-click="ctrl.delete()">
-					Delete
-				</button>
-				<a class="btn btn-link" href="datasources">Cancel</a>
-			</div>
+    <div ng-if="ctrl.hasDashboards">
+      <h3 class="section-heading">Bundled Plugin Dashboards</h3>
+      <div class="section">
+        <dashboard-import-list plugin="ctrl.datasourceMeta" datasource="ctrl.current"></dashboard-import-list>
+      </div>
+    </div>
 
-			<br />
-			<br />
-			<br />
+    <div ng-if="ctrl.testing" class="gf-form-group section">
+      <h5 ng-show="!ctrl.testing.done">Testing.... <i class="fa fa-spiner fa-spin"></i></h5>
+      <div class="alert-{{ctrl.testing.status}} alert" ng-show="ctrl.testing.done">
+        <div class="alert-icon">
+          <i class="fa fa-exclamation-triangle" ng-show="ctrl.testing.status === 'error'"></i>
+          <i class="fa fa-check" ng-show="ctrl.testing.status !== 'error'"></i>
+        </div>
+        <div class="alert-body">
+          <div class="alert-title">{{ctrl.testing.message}}</div>
+        </div>
+      </div>
+    </div>
 
-		</form>
-	</div>
-	<div ng-if="ctrl.tabIndex === 1">
-		<dashboard-import-list plugin="ctrl.datasourceMeta" datasource="ctrl.current"></dashboard-import-list>
-	</div>
+    <div class="gf-form-button-row">
+      <button type="submit" class="btn btn-success" ng-disabled="ctrl.current.readOnly"  ng-click="ctrl.saveChanges()">Save</button>
+      <button type="submit" class="btn btn-danger" ng-disabled="ctrl.current.readOnly"  ng-show="!ctrl.isNew" ng-click="ctrl.delete()">
+        Delete
+      </button>
+      <a class="btn btn-link" href="datasources">Cancel</a>
+    </div>
+
+    <br />
+    <br />
+    <br />
+
+  </form>
 </div>
diff --git a/public/app/features/plugins/partials/ds_http_settings.html b/public/app/features/plugins/partials/ds_http_settings.html
index 0bc2e7dd1d9..0e36cee833b 100644
--- a/public/app/features/plugins/partials/ds_http_settings.html
+++ b/public/app/features/plugins/partials/ds_http_settings.html
@@ -39,38 +39,37 @@
   </div>
 
   <h3 class="section-heading">Auth</h3>
-    <div class="gf-form-group">
-      <div class="gf-form-inline">
-        <gf-form-switch class="gf-form" label="Basic Auth" checked="current.basicAuth" label-class="width-8" switch-class="max-width-6"></gf-form-switch>
-        <gf-form-switch class="gf-form" label="With Credentials" tooltip="Whether credentials such as cookies or auth headers should be sent with cross-site requests." checked="current.withCredentials" label-class="width-11" switch-class="max-width-6"></gf-form-switch>
-      </div>
-      <div class="gf-form-inline">
-        <gf-form-switch class="gf-form" ng-if="current.access=='proxy'" label="TLS Client Auth" label-class="width-8" checked="current.jsonData.tlsAuth" switch-class="max-width-6"></gf-form-switch>
-        <gf-form-switch class="gf-form" ng-if="current.access=='proxy'" label="With CA Cert" tooltip="Needed for verifing self-signed TLS Certs" checked="current.jsonData.tlsAuthWithCACert" label-class="width-11" switch-class="max-width-6"></gf-form-switch>
-      </div>
-    </div>
-
+  <div class="gf-form-group">
     <div class="gf-form-inline">
-      <gf-form-switch class="gf-form" ng-if="current.access=='proxy'" label="Skip TLS Verification (Insecure)" label-class="width-16" checked="current.jsonData.tlsSkipVerify" switch-class="max-width-6"></gf-form-switch>
+      <gf-form-switch class="gf-form" label="Basic Auth" checked="current.basicAuth" label-class="width-8" switch-class="max-width-6"></gf-form-switch>
+      <gf-form-switch class="gf-form" label="With Credentials" tooltip="Whether credentials such as cookies or auth headers should be sent with cross-site requests." checked="current.withCredentials" label-class="width-11" switch-class="max-width-6"></gf-form-switch>
     </div>
+    <div class="gf-form-inline">
+      <gf-form-switch class="gf-form" ng-if="current.access=='proxy'" label="TLS Client Auth" label-class="width-8" checked="current.jsonData.tlsAuth" switch-class="max-width-6"></gf-form-switch>
+      <gf-form-switch class="gf-form" ng-if="current.access=='proxy'" label="With CA Cert" tooltip="Needed for verifing self-signed TLS Certs" checked="current.jsonData.tlsAuthWithCACert" label-class="width-11" switch-class="max-width-6"></gf-form-switch>
+    </div>
+  </div>
+
+  <div class="gf-form-inline">
+    <gf-form-switch class="gf-form" ng-if="current.access=='proxy'" label="Skip TLS Verification (Insecure)" label-class="width-16" checked="current.jsonData.tlsSkipVerify" switch-class="max-width-6"></gf-form-switch>
   </div>
 </div>
 
 <div class="gf-form-group" ng-if="current.basicAuth">
   <h6>Basic Auth Details</h6>
-	<div class="gf-form" ng-if="current.basicAuth">
-		<span class="gf-form-label width-7">
-			User
-		</span>
-		<input class="gf-form-input max-width-21" type="text"  ng-model='current.basicAuthUser' placeholder="user" required></input>
-	</div>
+  <div class="gf-form" ng-if="current.basicAuth">
+    <span class="gf-form-label width-7">
+      User
+    </span>
+    <input class="gf-form-input max-width-21" type="text"  ng-model='current.basicAuthUser' placeholder="user" required></input>
+  </div>
 
-	<div class="gf-form">
-		<span class="gf-form-label width-7">
-			Password
-		</span>
-		<input class="gf-form-input max-width-21" type="password" ng-model='current.basicAuthPassword' placeholder="password" required></input>
-	</div>
+  <div class="gf-form">
+    <span class="gf-form-label width-7">
+      Password
+    </span>
+    <input class="gf-form-input max-width-21" type="password" ng-model='current.basicAuthPassword' placeholder="password" required></input>
+  </div>
 </div>
 
 <div class="gf-form-group" ng-if="(current.jsonData.tlsAuth || current.jsonData.tlsAuthWithCACert) && current.access=='proxy'">
diff --git a/public/app/plugins/datasource/graphite/partials/config.html b/public/app/plugins/datasource/graphite/partials/config.html
index 804d339452e..58afc32de19 100644
--- a/public/app/plugins/datasource/graphite/partials/config.html
+++ b/public/app/plugins/datasource/graphite/partials/config.html
@@ -3,7 +3,7 @@
 	suggest-url="http://localhost:8080">
 </datasource-http-settings>
 
-<h3 class="page-heading">Graphite details</h3>
+<h3 class="section-heading">Graphite details</h3>
 
 <div class="gf-form-group">
 	<div class="gf-form">