diff --git a/public/app/features/panellinks/module.html b/public/app/features/panellinks/module.html
index 99f93d21eda..49c6de5dff8 100644
--- a/public/app/features/panellinks/module.html
+++ b/public/app/features/panellinks/module.html
@@ -56,7 +56,7 @@
 				</ul>
 				<div class="clearfix"></div>
 			</div>
-			<div class="tight-form">
+			<div class="tight-form last">
 				<ul class="tight-form-list">
 					<li class="tight-form-item" style="width: 20px">
 						<i class="fa fa-fw fa-unlink invisible"></i>
diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index ad8dca84f49..ca304536849 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -246,7 +246,7 @@
 			<div class="editor-row" ng-if="current.type === 'query'">
 				<div class="tight-form-section">
 					<h5>Value groups/tags (Experimental feature)</h5>
-					<div class="tight-form" ng-if="current.useTags">
+					<div class="tight-form last" ng-if="current.useTags">
 						<ul class="tight-form-list">
 							<li class="tight-form-item" style="width: 135px">
 								Tags query
diff --git a/public/app/panels/graph/graph.tooltip.js b/public/app/panels/graph/graph.tooltip.js
index 1154f662a7d..8a747b61e0c 100644
--- a/public/app/panels/graph/graph.tooltip.js
+++ b/public/app/panels/graph/graph.tooltip.js
@@ -69,7 +69,7 @@ function ($) {
         }
 
         // Highlighting multiple Points depending on the plot type
-        if (scope.panel.steppedLine || scope.panel.stack) {
+        if (series.lines.steps || series.stack) {
           // stacked and steppedLine plots can have series with different length.
           // Stacked series can increase its length on each new stacked serie if null points found,
           // to speed the index search we begin always on the last found hoverIndex.
diff --git a/public/app/partials/panelgeneral.html b/public/app/partials/panelgeneral.html
index 0d7cbb2c939..09ccbe86dfa 100644
--- a/public/app/partials/panelgeneral.html
+++ b/public/app/partials/panelgeneral.html
@@ -1,7 +1,7 @@
 <div class="editor-row">
   <div class="section">
     <h5>General options</h5>
-		<div class="tight-form">
+		<div class="tight-form last">
 			<ul class="tight-form-list">
 				<li class="tight-form-item">
 					Title
@@ -32,7 +32,7 @@
 	</div>
 	<div class="section">
 		<h5>Templating options</h5>
-		<div class="tight-form">
+		<div class="tight-form last">
 			<ul class="tight-form-list">
 				<li class="tight-form-item">
 					Repeat Panel
diff --git a/public/test/specs/graph-tooltip-specs.js b/public/test/specs/graph-tooltip-specs.js
index 45d50134a6c..864e87d07f8 100644
--- a/public/test/specs/graph-tooltip-specs.js
+++ b/public/test/specs/graph-tooltip-specs.js
@@ -41,8 +41,8 @@ define([
   describeSharedTooltip("steppedLine false, stack false", function(ctx) {
     ctx.setup(function() {
       ctx.data = [
-        { data: [[10, 15], [12, 20]], },
-        { data: [[10, 2], [12, 3]], }
+        { data: [[10, 15], [12, 20]], lines: {} },
+        { data: [[10, 2], [12, 3]], lines: {} }
       ];
       ctx.pos = { x: 11 };
     });
@@ -75,6 +75,7 @@ define([
       ctx.data = [
         {
           data: [[10, 15], [12, 20]],
+          lines: {},
           datapoints: {
             pointsize: 2,
             points: [[10,15], [12,20]],
@@ -83,6 +84,7 @@ define([
         },
         {
           data: [[10, 2], [12, 3]],
+          lines: {},
           datapoints: {
             pointsize: 2,
             points: [[10, 2], [12, 3]],
@@ -104,6 +106,7 @@ define([
       ctx.data = [
         {
           data: [[10, 15], [12, 20]],
+          lines: {},
           datapoints: {
             pointsize: 2,
             points: [[10, 15], [12, 20]],
@@ -112,6 +115,7 @@ define([
         },
         {
           data: [[10, 2], [12, 3]],
+          lines: {},
           datapoints: {
             pointsize: 2,
             points: [[10, 2], [12, 3]],
@@ -134,6 +138,7 @@ define([
       ctx.data = [
         {
           data: [[10, 15], [12, 20]],
+          lines: {},
           datapoints: {
             pointsize: 2,
             points: [[10, 15], [12, 20]],
@@ -142,6 +147,7 @@ define([
         },
         {
           data: [[10, 2], [12, 3]],
+          lines: {},
           datapoints: {
             pointsize: 2,
             points: [[10, 2], [12, 3]],