diff --git a/public/app/features/dashboard/dashgrid/EditorTabBody.tsx b/public/app/features/dashboard/dashgrid/EditorTabBody.tsx
index 63c8e74ef94..6ac3cd0573f 100644
--- a/public/app/features/dashboard/dashgrid/EditorTabBody.tsx
+++ b/public/app/features/dashboard/dashgrid/EditorTabBody.tsx
@@ -98,7 +98,7 @@ export class EditorTabBody extends PureComponent<Props, State> {
     const { children, toolbarItems, main, heading } = this.props;
     const { openView } = this.state;
     return (
-      <div className="panel-editor__right">
+      <>
         <div className="toolbar">
           <div className="toolbar__heading">{heading}</div>
           {main && this.renderMainSelection(main)}
@@ -115,7 +115,7 @@ export class EditorTabBody extends PureComponent<Props, State> {
             </div>
           </CustomScrollbar>
         </div>
-      </div>
+      </>
     );
   }
 }
diff --git a/public/app/features/dashboard/dashgrid/PanelEditor.tsx b/public/app/features/dashboard/dashgrid/PanelEditor.tsx
index 0d38b60fa95..24856006e28 100644
--- a/public/app/features/dashboard/dashgrid/PanelEditor.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelEditor.tsx
@@ -96,7 +96,7 @@ export class PanelEditor extends PureComponent<PanelEditorProps> {
             return <TabItem tab={tab} activeTab={activeTab} onClick={this.onChangeTab} key={tab.id} />;
           })}
         </div>
-        {this.renderCurrentTab(activeTab)}
+        <div className="panel-editor__right">{this.renderCurrentTab(activeTab)}</div>
       </div>
     );
   }
diff --git a/public/app/features/dashboard/dashgrid/VisualizationTab.tsx b/public/app/features/dashboard/dashgrid/VisualizationTab.tsx
index 75e9940d67c..bcb1c0bb0a6 100644
--- a/public/app/features/dashboard/dashgrid/VisualizationTab.tsx
+++ b/public/app/features/dashboard/dashgrid/VisualizationTab.tsx
@@ -126,8 +126,14 @@ export class VisualizationTab extends PureComponent<Props> {
       },
     };
 
+    const panelHelp = {
+      title: '',
+      icon: 'fa fa-question',
+      render: () => <h2>Help</h2>,
+    };
+
     return (
-      <EditorTabBody heading="Visualization" main={panelSelection} toolbarItems={[]}>
+      <EditorTabBody heading="Visualization" main={panelSelection} toolbarItems={[panelHelp]}>
         {this.renderPanelOptions()}
       </EditorTabBody>
     );
diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss
index 27a3ad01bf7..436014346d3 100644
--- a/public/sass/components/_panel_editor.scss
+++ b/public/sass/components/_panel_editor.scss
@@ -162,7 +162,7 @@
   display: flex;
   flex-direction: column;
   position: absolute;
-  top: 60px;
+  top: 79px;
   left: 5px;
   align-items: center;
 
diff --git a/public/sass/components/_toolbar.scss b/public/sass/components/_toolbar.scss
index 9e850968bcf..72ab783fed2 100644
--- a/public/sass/components/_toolbar.scss
+++ b/public/sass/components/_toolbar.scss
@@ -6,7 +6,7 @@
   position: relative;
   z-index: 1;
   flex: 0 0 auto;
-  background: $input-label-bg;
+  background: $black;
   border-bottom: 1px solid $black;
   border-radius: 3px;
 }
@@ -44,10 +44,7 @@
 
 .toolbar-subview {
   position: relative;
-  padding: 20px 20px;
-  background-color: $empty-list-cta-bg;
-  top: -45px;
-  margin: 0 30px 20px 0px;
+  top: -23px;
 }
 
 .toolbar-subview__close {
@@ -56,7 +53,7 @@
   border: none;
   position: absolute;
   right: 15px;
-  top: 20px;
+  top: 0px;
   font-size: $font-size-md;
 
   &:hover {