diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneContent.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneContent.tsx
index 43987d2b441..3cc2d533068 100644
--- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneContent.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneContent.tsx
@@ -184,11 +184,14 @@ export const TabsBarContent: React.FC<{
         </div>
       ) : (
         <>
-          {tabSelections.map(item => {
-            return (
-              <Tab label={item.label} active={activeTab === item.value} onChangeTab={() => setActiveTab(item.value)} />
-            );
-          })}
+          {tabSelections.map(item => (
+            <Tab
+              key={item.value}
+              label={item.label}
+              active={activeTab === item.value}
+              onChangeTab={() => setActiveTab(item.value)}
+            />
+          ))}
           <div className="flex-grow-1" />
         </>
       )}
@@ -219,7 +222,7 @@ const tabSelections: Array<SelectableValue<string>> = [
     value: 'options',
   },
   {
-    label: 'Data',
+    label: 'Fields',
     value: 'defaults',
   },
   {
diff --git a/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx b/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx
index ecb4867df1e..8851a40e2e2 100644
--- a/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/PanelOptionsTab.tsx
@@ -96,49 +96,50 @@ export const PanelOptionsTab: FC<Props> = ({
   }
 
   elements.push(
-    <>
-      <OptionsGroup title="Panel links" key="panel links" defaultToClosed={true}>
-        <DataLinksInlineEditor
-          links={panel.links}
-          onChange={links => onPanelConfigChange('links', links)}
-          suggestions={linkVariablesSuggestions}
-          data={[]}
-        />
-      </OptionsGroup>
-      <OptionsGroup title="Panel repeats" key="panel repeats" defaultToClosed={true}>
-        <Forms.Field
-          label="Repeat by variable"
-          description="Repeat this panel for each value in the selected variable.
+    <OptionsGroup title="Panel links" key="panel links" defaultToClosed={true}>
+      <DataLinksInlineEditor
+        links={panel.links}
+        onChange={links => onPanelConfigChange('links', links)}
+        suggestions={linkVariablesSuggestions}
+        data={[]}
+      />
+    </OptionsGroup>
+  );
+
+  elements.push(
+    <OptionsGroup title="Panel repeats" key="panel repeats" defaultToClosed={true}>
+      <Forms.Field
+        label="Repeat by variable"
+        description="Repeat this panel for each value in the selected variable.
           This is not visible while in edit mode. You need to go back to dashboard and then update the variable or
           reload the dashboard."
-        >
-          <Select
-            value={panel.repeat}
-            onChange={value => onPanelConfigChange('repeat', value.value)}
-            options={variableOptions}
+      >
+        <Select
+          value={panel.repeat}
+          onChange={value => onPanelConfigChange('repeat', value.value)}
+          options={variableOptions}
+        />
+      </Forms.Field>
+      {panel.repeat && (
+        <Forms.Field label="Repeat direction">
+          <Forms.RadioButtonGroup
+            options={directionOptions}
+            value={panel.repeatDirection || 'h'}
+            onChange={value => onPanelConfigChange('repeatDirection', value)}
           />
         </Forms.Field>
-        {panel.repeat && (
-          <Forms.Field label="Repeat direction">
-            <Forms.RadioButtonGroup
-              options={directionOptions}
-              value={panel.repeatDirection || 'h'}
-              onChange={value => onPanelConfigChange('repeatDirection', value)}
-            />
-          </Forms.Field>
-        )}
+      )}
 
-        {panel.repeat && panel.repeatDirection === 'h' && (
-          <Forms.Field label="Max per row">
-            <Select
-              options={maxPerRowOptions}
-              value={panel.maxPerRow}
-              onChange={value => onPanelConfigChange('maxPerRow', value.value)}
-            />
-          </Forms.Field>
-        )}
-      </OptionsGroup>
-    </>
+      {panel.repeat && panel.repeatDirection === 'h' && (
+        <Forms.Field label="Max per row">
+          <Select
+            options={maxPerRowOptions}
+            value={panel.maxPerRow}
+            onChange={value => onPanelConfigChange('maxPerRow', value.value)}
+          />
+        </Forms.Field>
+      )}
+    </OptionsGroup>
   );
 
   return <>{elements}</>;
diff --git a/public/app/plugins/panel/table2/TablePanel.tsx b/public/app/plugins/panel/table2/TablePanel.tsx
index ea01b9c772d..981b6073f6f 100644
--- a/public/app/plugins/panel/table2/TablePanel.tsx
+++ b/public/app/plugins/panel/table2/TablePanel.tsx
@@ -20,6 +20,6 @@ export class TablePanel extends Component<Props> {
       return <div>No Table Data...</div>;
     }
 
-    return <Table height={height} width={width} data={data.series[0]} noHeader={!options.showHeader} />;
+    return <Table height={height - 16} width={width} data={data.series[0]} noHeader={!options.showHeader} />;
   }
 }
diff --git a/public/app/plugins/panel/table2/module.tsx b/public/app/plugins/panel/table2/module.tsx
index 5fb17e3108e..6e21fbaac8a 100644
--- a/public/app/plugins/panel/table2/module.tsx
+++ b/public/app/plugins/panel/table2/module.tsx
@@ -15,7 +15,6 @@ export const plugin = new PanelPlugin<Options, CustomFieldConfig>(TablePanel)
           min: 20,
           max: 300,
         },
-        defaultValue: 1,
       })
       .addSelect({
         id: 'displayMode',