diff --git a/src/app/features/dashboard/all.js b/src/app/features/dashboard/all.js
index 0bd631447a7..e9edfe7fcdd 100644
--- a/src/app/features/dashboard/all.js
+++ b/src/app/features/dashboard/all.js
@@ -1,7 +1,7 @@
 define([
   './dashboardCtrl',
   './dashboardNavCtrl',
-  './cloneDashboardCtrl',
+  './saveDashboardAsCtrl',
   './playlistCtrl',
   './rowCtrl',
   './sharePanelCtrl',
diff --git a/src/app/features/dashboard/dashboardNavCtrl.js b/src/app/features/dashboard/dashboardNavCtrl.js
index fa639d5dbad..2148836ac12 100644
--- a/src/app/features/dashboard/dashboardNavCtrl.js
+++ b/src/app/features/dashboard/dashboardNavCtrl.js
@@ -120,12 +120,12 @@ function (angular, _, moment) {
       });
     };
 
-    $scope.cloneDashboard = function() {
+    $scope.saveDashboardAs = function() {
       var newScope = $rootScope.$new();
       newScope.clone = angular.copy($scope.dashboard);
 
       $scope.appEvent('show-modal', {
-        src: './app/features/dashboard/partials/cloneDashboard.html',
+        src: './app/features/dashboard/partials/saveDashboardAs.html',
         scope: newScope,
       });
     };
diff --git a/src/app/features/dashboard/partials/cloneDashboard.html b/src/app/features/dashboard/partials/saveDashboardAs.html
similarity index 71%
rename from src/app/features/dashboard/partials/cloneDashboard.html
rename to src/app/features/dashboard/partials/saveDashboardAs.html
index dcbea9d1d00..8d04280465e 100644
--- a/src/app/features/dashboard/partials/cloneDashboard.html
+++ b/src/app/features/dashboard/partials/saveDashboardAs.html
@@ -1,8 +1,8 @@
-<div class="modal-body gf-box gf-box-no-margin" ng-controller="CloneDashboardCtrl" ng-init="init();">
+<div class="modal-body gf-box gf-box-no-margin" ng-controller="SaveDashboardAsCtrl" ng-init="init();">
 	<div class="gf-box-header">
 		<div class="gf-box-title">
 			<i class="fa fa-copy"></i>
-			Clone Dashboard
+			Save As...
 		</div>
 
 		<button class="gf-box-header-close-btn" ng-click="dismiss();">
@@ -18,8 +18,8 @@
 			<br>
 			<br>
 
-			<button class="btn btn-success" ng-click="saveClone();">Clone</button>
 			<button class="btn btn-inverse" ng-click="dismiss();">Cancel</button>
+			<button class="btn btn-success" ng-click="saveClone();">Save</button>
 		</div>
 	</div>
 </div>
diff --git a/src/app/features/dashboard/cloneDashboardCtrl.js b/src/app/features/dashboard/saveDashboardAsCtrl.js
similarity index 88%
rename from src/app/features/dashboard/cloneDashboardCtrl.js
rename to src/app/features/dashboard/saveDashboardAsCtrl.js
index ecbc0895d8b..16dc291e9fa 100644
--- a/src/app/features/dashboard/cloneDashboardCtrl.js
+++ b/src/app/features/dashboard/saveDashboardAsCtrl.js
@@ -6,7 +6,7 @@ function (angular) {
 
   var module = angular.module('grafana.controllers');
 
-  module.controller('CloneDashboardCtrl', function($scope, backendSrv, $location) {
+  module.controller('SaveDashboardAsCtrl', function($scope, backendSrv, $location) {
 
     $scope.init = function() {
       $scope.clone.id = null;
diff --git a/src/app/features/org/partials/datasourceEdit.html b/src/app/features/org/partials/datasourceEdit.html
index f1b0ef46038..c0fdf19bb77 100644
--- a/src/app/features/org/partials/datasourceEdit.html
+++ b/src/app/features/org/partials/datasourceEdit.html
@@ -49,7 +49,7 @@
 						Url
 					</li>
 					<li>
-						<input type="text" class="tight-form-input input-xlarge" ng-model='current.url' placeholder="http://my.graphite.com:8080" required></input>
+						<input type="text" class="tight-form-input input-xlarge" ng-model='current.url' placeholder="http://my.server.com:8080" required></input>
 					</li>
 					<li class="tight-form-item">
 					  Access <tip>Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request</label>
diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html
index 1a98b428fbf..5f458ae1cdd 100644
--- a/src/app/partials/dashboard_topnav.html
+++ b/src/app/partials/dashboard_topnav.html
@@ -43,7 +43,7 @@
 						<li><a class="pointer" ng-click="openEditView('templating');">Templating</a></li>
 						<li><a class="pointer" ng-click="exportDashboard();">Export</a></li>
 						<li><a class="pointer" ng-click="editJson();">View JSON</a></li>
-						<li><a class="pointer" ng-click="cloneDashboard();">Clone dashboard</a></li>
+						<li><a class="pointer" ng-click="saveDashboardAs();">Save As...</a></li>
 						<li><a class="pointer" ng-click="deleteDashboard();">Delete dashboard</a></li>
 					</ul>
 				</li>
diff --git a/src/app/plugins/datasource/elasticsearch/partials/config.html b/src/app/plugins/datasource/elasticsearch/partials/config.html
index 21b3d51e5cf..2ebdf43a486 100644
--- a/src/app/plugins/datasource/elasticsearch/partials/config.html
+++ b/src/app/plugins/datasource/elasticsearch/partials/config.html
@@ -1,4 +1,4 @@
-<h2>Elastic search details</h2>
+<h5>Elastic search details</h5>
 
 <div class="tight-form last">
 	<ul class="tight-form-list">
@@ -6,7 +6,7 @@
 			Index name
 		</li>
 		<li>
-			<input type="text" class="tight-form-input input-xxlarge last" ng-model='current.database' placeholder="" required></input>
+			<input type="text" class="tight-form-input input-xlarge" ng-model='current.database' placeholder="" required></input>
 		</li>
 	</ul>
 	<div class="clearfix"></div>
diff --git a/src/app/plugins/datasource/influxdb/partials/config.html b/src/app/plugins/datasource/influxdb/partials/config.html
new file mode 100644
index 00000000000..541db7cd15d
--- /dev/null
+++ b/src/app/plugins/datasource/influxdb/partials/config.html
@@ -0,0 +1,32 @@
+<h5>InfluxDB Details</h5>
+
+<div class="tight-form">
+	<ul class="tight-form-list">
+		<li class="tight-form-item" style="width: 80px">
+			Database
+		</li>
+		<li>
+			<input type="text" class="tight-form-input input-large" ng-model='current.database' placeholder="" required></input>
+		</li>
+	</ul>
+	<div class="clearfix"></div>
+</div>
+<div class="tight-form last">
+	<ul class="tight-form-list">
+		<li class="tight-form-item" style="width: 80px">
+			User
+		</li>
+		<li>
+			<input type="text" class="tight-form-input input-large" ng-model='current.user' placeholder="" required></input>
+		</li>
+		<li class="tight-form-item">
+			Password
+		</li>
+		<li>
+			<input type="password" class="tight-form-input input-large" ng-model='current.password' placeholder="" required></input>
+		</li>
+	</ul>
+	<div class="clearfix"></div>
+</div>
+
+
diff --git a/src/app/plugins/datasource/influxdb_08/partials/config.html b/src/app/plugins/datasource/influxdb_08/partials/config.html
index d7c5d165044..541db7cd15d 100644
--- a/src/app/plugins/datasource/influxdb_08/partials/config.html
+++ b/src/app/plugins/datasource/influxdb_08/partials/config.html
@@ -23,7 +23,7 @@
 			Password
 		</li>
 		<li>
-			<input type="text" class="tight-form-input input-large" ng-model='current.password' placeholder="" required></input>
+			<input type="password" class="tight-form-input input-large" ng-model='current.password' placeholder="" required></input>
 		</li>
 	</ul>
 	<div class="clearfix"></div>