diff --git a/public/app/features/dashboard/partials/linksEditor.html b/public/app/features/dashboard/partials/linksEditor.html
deleted file mode 100644
index 41c331312b0..00000000000
--- a/public/app/features/dashboard/partials/linksEditor.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<div ng-controller="DashLinksController">
-	<div class="editor-row">
-		<div class="tight-form-section">
-			<h5>Links and Dash Navigation</h5>
-
-			<div ng-repeat="link in panel.links">
-				<div class="tight-form" >
-					<ul class="tight-form-list">
-						<li class="tight-form-item">
-							<i class="fa fa-remove pointer" ng-click="deleteLink(link)"></i>
-						</li>
-
-						<li class="tight-form-item" style="width: 80px;">Link title</li>
-						<li>
-							<input type="text" ng-model="link.title" class="input-medium tight-form-input">
-						</li>
-
-						<li class="tight-form-item">Type</li>
-						<li>
-							<select class="input-medium tight-form-input" style="width: 101px;" ng-model="link.type" ng-options="f for f in ['dashboard','absolute']"></select>
-						</li>
-
-						<li class="tight-form-item" ng-show="link.type === 'dashboard'">Dashboard</li>
-						<li ng-show="link.type === 'dashboard'">
-							<input type="text"
-							ng-model="link.dashboard"
-							bs-typeahead="searchDashboards"
-							class="input-large tight-form-input">
-						</li>
-
-						<li class="tight-form-item" ng-show="link.type === 'absolute'">Url</li>
-						<li ng-show="link.type === 'absolute'">
-							<input type="text" ng-model="link.url" class="input-xlarge tight-form-input">
-						</li>
-					</ul>
-					<div class="clearfix"></div>
-				</div>
-				<div class="tight-form">
-					<ul class="tight-form-list" role="menu">
-						<li class="tight-form-item">
-							<i class="fa fa-remove invisible"></i>
-						</li>
-						<li class="tight-form-item" style="width: 80px;">
-							Params
-							<tip>Use var-variableName=value to pass templating variables.</tip>
-						</li>
-						<li>
-							<input type="text" ng-model="link.params" class="input-xxlarge tight-form-input">
-						</li>
-					</ul>
-					<div class="clearfix"></div>
-				</div>
-			</div>
-
-		</div>
-	</div>
-
-	<div class="editor-row">
-		<br>
-		<button class="btn btn-inverse" ng-click="addLink()"><i class="fa fa-plus"></i> Add link</button>
-	</div>
-</div>
diff --git a/public/app/features/dashboard/partials/settings.html b/public/app/features/dashboard/partials/settings.html
index d4ef1d14eae..2e7a3a8624a 100644
--- a/public/app/features/dashboard/partials/settings.html
+++ b/public/app/features/dashboard/partials/settings.html
@@ -67,17 +67,16 @@
 				</div>
 
 				<div class="gf-form">
-					<button class="btn btn-inverse btn-mini" ng-hide="$first" style="margin-right: 5px;">
-						<i ng-click="_.move(dashboard.rows,$index,$index-1)"  ng-class="{'invisible': $first}" class="fa fa-arrow-up"></i>
+					<button class="btn btn-inverse btn-mini" style="margin-right: 5px;" ng-click="dashboard.rows = _.without(dashboard.rows,row)">
+						<i class="fa fa-trash"></i>
 					</button>
-					<button class="btn btn-inverse btn-mini" ng-hide="$last" style="margin-right: 5px;">
-						<i ng-click="_.move(dashboard.rows,$index,$index+1)" ng-class="{'invisible': $last}" class="fa fa-arrow-down"></i>
+					<button class="btn btn-inverse btn-mini" ng-hide="$first" style="margin-right: 5px;" ng-click="_.move(dashboard.rows,$index,$index-1)">
+						<i ng-class="{'invisible': $first}" class="fa fa-arrow-up"></i>
 					</button>
-					<button class="btn btn-danger btn-mini" style="margin-right: 5px;">
-						<i ng-click="dashboard.rows = _.without(dashboard.rows,row)" class="fa fa-remove"></i>
+					<button class="btn btn-inverse btn-mini" ng-hide="$last" style="margin-right: 5px;" ng-click="_.move(dashboard.rows,$index,$index+1)">
+						<i ng-class="{'invisible': $last}" class="fa fa-arrow-down"></i>
 					</button>
 				</div>
-
 			</div>
 		</div>
 	</div>
diff --git a/public/app/features/dashlinks/editor.html b/public/app/features/dashlinks/editor.html
index 43934238be5..f52835aa5f9 100644
--- a/public/app/features/dashlinks/editor.html
+++ b/public/app/features/dashlinks/editor.html
@@ -1,21 +1,10 @@
 <div class="editor-row">
-	<h5 class="page-heading">Links and Dash Navigation</h5>
+	<h5 class="section-heading">Links and Dash Navigation</h5>
 
 	<div ng-repeat="link in dashboard.links">
-		<div class="gf-form-group" style="/*background: #292929; border-bottom: 2px solid #1f1d1d; padding: 10px; margin-bottom: 5px;*/">
-			<div class="gf-form-inline pull-right">
-				<div class="gf-form-buttons-row">
-					<button class="btn btn-inverse btn-mini" ng-hide="$first"><i ng-click="moveLink($index, -1)" class="fa fa-arrow-up"></i></button>
-					<button class="btn btn-inverse btn-mini" ng-hide="$last"><i ng-click="moveLink($index, 1)" class="fa fa-arrow-down"></i></button>
-					<button class="btn btn-inverse btn-mini"><i class="fa fa-remove" ng-click="deleteLink($index)"></i></button>
-				</div>
-			</div>
 
+		<div class="gf-form-group">
 			<div class="gf-form-inline">
-				<div class="gf-form width-2">
-					<i class="fa fa-fw fa-unlink"></i>
-				</div>
-
 				<div class="gf-form">
 					<span class="gf-form-label width-6">Type</span>
 					<div class="gf-form-select-wrapper width-10">
@@ -28,26 +17,32 @@
 					<bootstrap-tagsinput ng-model="link.tags" tagclass="label label-tag" placeholder="add tags"></bootstrap-tagsinput>
 				</div>
 
-				<div class="gf-form" ng-show="link.type === 'dashboards' && link.asDropdown">
-					<span class="gf-form-label width-6">Title</span>
-					<input type="text" ng-model="link.title" class="gf-form-input max-width-10" ng-model-onblur ng-change="updated()">
-				</div>
-
 				<div class="gf-form" ng-show="link.type === 'dashboards'">
 					<editor-checkbox text="As dropdown" model="link.asDropdown" change="updated()"></editor-checkbox>
 				</div>
 
-				<div class="gf-form" ng-show="link.type === 'link'">
+				<div class="gf-form max-width-30" ng-show="link.type === 'link'">
 					<li class="gf-form-label width-6">Url</li>
-					<input type="text" ng-model="link.url" class="gf-form-input max-width-10" ng-model-onblur ng-change="updated()">
-					<editor-checkbox text="Open in new tab " model="link.targetBlank" change="updated()"></editor-checkbox>
+					<input type="text" ng-model="link.url" class="gf-form-input" ng-model-onblur ng-change="updated()">
+				</div>
+
+				<div class="gf-form">
+					<button class="btn btn-inverse btn-mini" ng-click="moveLink($index, -1)" ng-hide="$first"><i class="fa fa-arrow-up"></i></button>
+				</div>
+				<div class="gf-form">
+					<button class="btn btn-inverse btn-mini" ng-click="moveLink($index, 1)" ng-hide="$last"><i class="fa fa-arrow-down"></i></button>
+				</div>
+				<div class="gf-form">
+					<button class="btn btn-inverse btn-mini" ng-click="deleteLink($index)"><i class="fa fa-trash" ></i></button>
 				</div>
 			</div>
 
+			<div class="gf-form" ng-show="link.type === 'dashboards' && link.asDropdown">
+				<span class="gf-form-label width-6">Title</span>
+				<input type="text" ng-model="link.title" class="gf-form-input max-width-25" ng-model-onblur ng-change="updated()">
+			</div>
+
 			<div class="gf-form-inline" ng-show="link.type === 'link'">
-				<div class="gf-form width-2">
-					<i class="fa fa-fw fa-unlink invisible"></i>
-				</div>
 				<div class="gf-form">
 					<span class="gf-form-label width-6">Title</span>
 					<input type="text" ng-model="link.title" class="gf-form-input max-width-10" ng-model-onblur ng-change="updated()">
@@ -67,12 +62,11 @@
 			</div>
 
 			<div class="gf-form-inline">
-				<div class="gf-form width-1">
-					<i class="fa fa-fw fa-unlink invisible"></i>
-				</div>
 				<div class="gf-form">
-					<editor-checkbox text="Keep current time range" model="link.keepTime" change="updated()"></editor-checkbox>
-					<editor-checkbox text="Add current variable values" model="link.includeVars" change="updated()"></editor-checkbox>
+					<span class="gf-form-label width-6">Include</span>
+					<editor-checkbox text="Time range" model="link.keepTime" change="updated()"></editor-checkbox>
+					<editor-checkbox text="Variable values" model="link.includeVars" change="updated()"></editor-checkbox>
+					<editor-checkbox text="Open in new tab " model="link.targetBlank" change="updated()"></editor-checkbox>
 				</div>
 			</div>
 		</div>