diff --git a/public/app/features/dashboard/partials/variableValueSelect.html b/public/app/features/dashboard/partials/variableValueSelect.html
index ff5291c11d3..30a61072626 100644
--- a/public/app/features/dashboard/partials/variableValueSelect.html
+++ b/public/app/features/dashboard/partials/variableValueSelect.html
@@ -1,24 +1,26 @@
 <span class="template-variable" ng-show="!variable.hideLabel" style="padding-right: 5px">
 	{{labelText}}:
 </span>
-<a ng-click="show()" class="variable-value-link">
-	{{linkText}}
-	<i class="fa fa-caret-down"></i>
-</a>
 
-<div ng-if="selectorOpen" class="variable-value-dropdown">
-	<div class="variable-search-wrapper">
-		<span style="position: relative;">
-			<input type="text" placeholder="Search values..." ng-keydown="keyDown($event)" give-focus="giveFocus" tabindex="1" ng-model="search.query" spellcheck='false' ng-change="queryChanged()" />
-		</span>
-	</div>
+<div style="position: relative; display: inline-block">
+	<a ng-click="show()" class="variable-value-link">
+		{{linkText}}
+		<i class="fa fa-caret-down"></i>
+	</a>
 
-	<div class="variable-options-container" ng-if="!query.tagcloud">
-		<a class="variable-option pointer" bindonce ng-repeat="option in search.options"
+	<div ng-if="selectorOpen" class="variable-value-dropdown">
+		<div class="variable-search-wrapper">
+			<span style="position: relative;">
+				<input type="text" placeholder="Search values..." ng-keydown="keyDown($event)" give-focus="giveFocus" tabindex="1" ng-model="search.query" spellcheck='false' ng-change="queryChanged()" />
+			</span>
+		</div>
+
+		<div class="variable-options-container" ng-if="!query.tagcloud">
+			<a class="variable-option pointer" bindonce ng-repeat="option in search.options"
 				ng-class="{'selected': option.selected, 'highlighted': $index === highlightIndex}" ng-click="optionSelected(option, $event)">
 				<span >{{option.text}}</label>
 				<span class="fa fa-fw variable-option-icon"></span>
-			</div>
-		</a>
+			</a>
+		</div>
 	</div>
 </div>
diff --git a/public/app/partials/panelgeneral.html b/public/app/partials/panelgeneral.html
index 8d4ef57b141..7a4b57b0db8 100644
--- a/public/app/partials/panelgeneral.html
+++ b/public/app/partials/panelgeneral.html
@@ -38,7 +38,7 @@
 					Repeat Panel
 				</li>
 				<li>
-					<select class="input-small tight-form-input" ng-model="panel.repeat" ng-options="f.name as f.name for f in dashboard.templating.list">
+					<select class="input-small tight-form-input last" ng-model="panel.repeat" ng-options="f.name as f.name for f in dashboard.templating.list">
 						<option value=""></option>
 					</select>
 				</li>
diff --git a/public/app/partials/roweditor.html b/public/app/partials/roweditor.html
index f47351c8ffa..37e258a9b89 100644
--- a/public/app/partials/roweditor.html
+++ b/public/app/partials/roweditor.html
@@ -1,3 +1,4 @@
+
 <div class="gf-box-header">
 	<div class="gf-box-title">
 		<i class="fa fa-th-list"></i>
@@ -16,24 +17,46 @@
 
 <div class="gf-box-body">
 
-	<div class="editor-row" ng-if="editor.index == 0">
+	<div class="editor-row">
 		<div class="section">
 			<h5>Row details</h5>
-			<div class="editor-option">
-				<label class="small">Title</label><input type="text" class="input-medium" ng-model='row.title'></input>
+			<div class="tight-form">
+				<ul class="tight-form-list">
+					<li class="tight-form-item">
+						Title
+					</li>
+					<li>
+						<input type="text" class="input-xlarge tight-form-input" ng-model='row.title'></input>
+					</li>
+					<li class="tight-form-item">
+						Height
+					</li>
+					<li>
+						<input type="text" class="input-small tight-form-input" ng-model='row.height'></input>
+					</li>
+					<li class="tight-form-item">
+						<label class="checkbox-label" for="row.showTitle">Show Title</label>
+						<input class="cr1" id="row.showTitle" type="checkbox" ng-model="row.showTitle" ng-checked="row.showTitle">
+						<label for="row.showTitle" class="cr1"></label>
+					</li>
+				</ul>
+				<div class="clearfix"></div>
 			</div>
-			<div class="editor-option">
-				<label class="small">Height</label><input type="text" class="input-mini" ng-model='row.height'></input>
-			</div>
-			<editor-opt-bool text="Editable" model="row.editable"></editor-opt-bool>
-			<editor-opt-bool text="Show title" model="row.showTitle"></editor-opt-bool>
 		</div>
-
 		<div class="section">
 			<h5>Templating options</h5>
-			<div class="editor-option">
-				<label class="small">Repeat row</label>
-				<input type="text" class="input-medium" ng-model='row.repeat'></input>
+			<div class="tight-form">
+				<ul class="tight-form-list">
+					<li class="tight-form-item">
+						Repeat Row
+					</li>
+					<li>
+						<select class="input-small tight-form-input last" ng-model="row.repeat" ng-options="f.name as f.name for f in dashboard.templating.list">
+							<option value=""></option>
+						</select>
+					</li>
+				</ul>
+				<div class="clearfix"></div>
 			</div>
 		</div>
 	</div>
diff --git a/public/css/less/submenu.less b/public/css/less/submenu.less
index f12de218d8b..f69ac9c5791 100644
--- a/public/css/less/submenu.less
+++ b/public/css/less/submenu.less
@@ -26,7 +26,7 @@
 
 .variable-value-dropdown {
   position: absolute;
-  top: 35px;
+  top: 27px;
   min-width: 150px;
   max-height: 400px;
   background: @grafanaPanelBackground;