diff --git a/src/plugins/vis_type_timeseries/public/application/components/annotations_editor.js b/src/plugins/vis_type_timeseries/public/application/components/annotations_editor.js
index 4d93a5207fa9e..09ce57639b952 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/annotations_editor.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/annotations_editor.js
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { i18n } from '@kbn/i18n';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import _ from 'lodash';
@@ -24,7 +25,6 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiFormRow,
-  EuiFormLabel,
   EuiSpacer,
   EuiFieldText,
   EuiTitle,
@@ -156,32 +156,36 @@ export class AnnotationsEditor extends Component {
                 </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiFormLabel>
-                  <FormattedMessage
-                    id="visTypeTimeseries.annotationsEditor.ignoreGlobalFiltersLabel"
-                    defaultMessage="Ignore global filters?"
+                <EuiFormRow
+                  label={i18n.translate(
+                    'visTypeTimeseries.annotationsEditor.ignoreGlobalFiltersLabel',
+                    {
+                      defaultMessage: 'Ignore global filters?',
+                    }
+                  )}
+                >
+                  <YesNo
+                    value={model.ignore_global_filters}
+                    name="ignore_global_filters"
+                    onChange={handleChange}
                   />
-                </EuiFormLabel>
-                <EuiSpacer size="m" />
-                <YesNo
-                  value={model.ignore_global_filters}
-                  name="ignore_global_filters"
-                  onChange={handleChange}
-                />
+                </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiFormLabel>
-                  <FormattedMessage
-                    id="visTypeTimeseries.annotationsEditor.ignorePanelFiltersLabel"
-                    defaultMessage="Ignore panel filters?"
+                <EuiFormRow
+                  label={i18n.translate(
+                    'visTypeTimeseries.annotationsEditor.ignorePanelFiltersLabel',
+                    {
+                      defaultMessage: 'Ignore panel filters?',
+                    }
+                  )}
+                >
+                  <YesNo
+                    value={model.ignore_panel_filters}
+                    name="ignore_panel_filters"
+                    onChange={handleChange}
                   />
-                </EuiFormLabel>
-                <EuiSpacer size="xs" />
-                <YesNo
-                  value={model.ignore_panel_filters}
-                  name="ignore_panel_filters"
-                  onChange={handleChange}
-                />
+                </EuiFormRow>
               </EuiFlexItem>
             </EuiFlexGroup>
 
diff --git a/src/plugins/vis_type_timeseries/public/application/components/index_pattern.js b/src/plugins/vis_type_timeseries/public/application/components/index_pattern.js
index c5b3d86f61b5d..556a3f2f691fb 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/index_pattern.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/index_pattern.js
@@ -126,6 +126,7 @@ export const IndexPattern = ({
   );
   const isTimeSeries = model.type === PANEL_TYPES.TIMESERIES;
   const isDataTimerangeModeInvalid =
+    !disabled &&
     selectedTimeRangeOption &&
     !isTimerangeModeEnabled(selectedTimeRangeOption.value, uiRestrictions);
 
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.tsx b/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.tsx
index 99c3fa8ea9673..f5cc90ee49acd 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.tsx
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.tsx
@@ -5,7 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 import React, { Component } from 'react';
 import uuid from 'uuid';
 import {
@@ -23,8 +24,7 @@ import {
   EuiTitle,
   EuiHorizontalRule,
 } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
+
 import type { Writable } from '@kbn/utility-types';
 
 // @ts-ignore
@@ -157,18 +157,20 @@ export class GaugePanelConfig extends Component<
                 </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiFormLabel>
-                  <FormattedMessage
-                    id="visTypeTimeseries.gauge.optionsTab.ignoreGlobalFilterLabel"
-                    defaultMessage="Ignore global filter?"
+                <EuiFormRow
+                  label={i18n.translate(
+                    'visTypeTimeseries.gauge.optionsTab.ignoreGlobalFilterLabel',
+                    {
+                      defaultMessage: 'Ignore global filter?',
+                    }
+                  )}
+                >
+                  <YesNo
+                    value={model.ignore_global_filter}
+                    name="ignore_global_filter"
+                    onChange={this.props.onChange}
                   />
-                </EuiFormLabel>
-                <EuiSpacer size="m" />
-                <YesNo
-                  value={model.ignore_global_filter}
-                  name="ignore_global_filter"
-                  onChange={this.props.onChange}
-                />
+                </EuiFormRow>
               </EuiFlexItem>
             </EuiFlexGroup>
           </EuiPanel>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/markdown.tsx b/src/plugins/vis_type_timeseries/public/application/components/panel_config/markdown.tsx
index c3f0f00125769..c33b4df914a81 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/markdown.tsx
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/markdown.tsx
@@ -172,18 +172,20 @@ export class MarkdownPanelConfig extends Component<
                 </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiFormLabel>
-                  <FormattedMessage
-                    id="visTypeTimeseries.markdown.optionsTab.ignoreGlobalFilterLabel"
-                    defaultMessage="Ignore global filter?"
+                <EuiFormRow
+                  label={i18n.translate(
+                    'visTypeTimeseries.markdown.optionsTab.ignoreGlobalFilterLabel',
+                    {
+                      defaultMessage: 'Ignore global filter?',
+                    }
+                  )}
+                >
+                  <YesNo
+                    value={model.ignore_global_filter}
+                    name="ignore_global_filter"
+                    onChange={this.props.onChange}
                   />
-                </EuiFormLabel>
-                <EuiSpacer size="m" />
-                <YesNo
-                  value={model.ignore_global_filter}
-                  name="ignore_global_filter"
-                  onChange={this.props.onChange}
-                />
+                </EuiFormRow>
               </EuiFlexItem>
             </EuiFlexGroup>
           </EuiPanel>
@@ -218,35 +220,34 @@ export class MarkdownPanelConfig extends Component<
                 />
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiFormLabel>
-                  <FormattedMessage
-                    id="visTypeTimeseries.markdown.optionsTab.showScrollbarsLabel"
-                    defaultMessage="Show scrollbars?"
+                <EuiFormRow
+                  label={i18n.translate(
+                    'visTypeTimeseries.markdown.optionsTab.showScrollbarsLabel',
+                    {
+                      defaultMessage: 'Show scrollbars?',
+                    }
+                  )}
+                >
+                  <YesNo
+                    value={model.markdown_scrollbars}
+                    name="markdown_scrollbars"
+                    onChange={this.props.onChange}
                   />
-                </EuiFormLabel>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <YesNo
-                  value={model.markdown_scrollbars}
-                  name="markdown_scrollbars"
-                  onChange={this.props.onChange}
-                />
+                </EuiFormRow>
               </EuiFlexItem>
 
               <EuiFlexItem grow={false}>
-                <EuiFormLabel>
-                  <FormattedMessage
-                    id="visTypeTimeseries.markdown.optionsTab.openLinksInNewTab"
-                    defaultMessage="Open links in new tab?"
+                <EuiFormRow
+                  label={i18n.translate('visTypeTimeseries.markdown.optionsTab.openLinksInNewTab', {
+                    defaultMessage: 'Open links in new tab?',
+                  })}
+                >
+                  <YesNo
+                    value={model.markdown_openLinksInNewTab}
+                    name="markdown_openLinksInNewTab"
+                    onChange={this.props.onChange}
                   />
-                </EuiFormLabel>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <YesNo
-                  value={model.markdown_openLinksInNewTab}
-                  name="markdown_openLinksInNewTab"
-                  onChange={this.props.onChange}
-                />
+                </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
                 <EuiFormLabel htmlFor={htmlId('valign')}>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/metric.tsx b/src/plugins/vis_type_timeseries/public/application/components/panel_config/metric.tsx
index f38d0ec83e957..68486d0d1e83f 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/metric.tsx
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/metric.tsx
@@ -5,7 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component } from 'react';
 import uuid from 'uuid';
 import {
@@ -16,12 +17,10 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiFormRow,
-  EuiFormLabel,
   EuiSpacer,
   EuiTitle,
   EuiHorizontalRule,
 } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
 
 // @ts-expect-error
 import { SeriesEditor } from '../series_editor';
@@ -121,18 +120,20 @@ export class MetricPanelConfig extends Component<
                 </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiFormLabel>
-                  <FormattedMessage
-                    id="visTypeTimeseries.metric.optionsTab.ignoreGlobalFilterLabel"
-                    defaultMessage="Ignore global filter?"
+                <EuiFormRow
+                  label={i18n.translate(
+                    'visTypeTimeseries.metric.optionsTab.ignoreGlobalFilterLabel',
+                    {
+                      defaultMessage: 'Ignore global filter?',
+                    }
+                  )}
+                >
+                  <YesNo
+                    value={model.ignore_global_filter}
+                    name="ignore_global_filter"
+                    onChange={this.props.onChange}
                   />
-                </EuiFormLabel>
-                <EuiSpacer size="m" />
-                <YesNo
-                  value={model.ignore_global_filter}
-                  name="ignore_global_filter"
-                  onChange={this.props.onChange}
-                />
+                </EuiFormRow>
               </EuiFlexItem>
             </EuiFlexGroup>
           </EuiPanel>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.tsx b/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.tsx
index 0847a35066494..4eae56c748671 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.tsx
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.tsx
@@ -17,7 +17,6 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiFormRow,
-  EuiFormLabel,
   EuiSpacer,
   EuiFieldText,
   EuiTitle,
@@ -28,6 +27,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
+import { i18n } from '@kbn/i18n';
 import { FieldSelect } from '../aggs/field_select';
 // @ts-expect-error not typed yet
 import { SeriesEditor } from '../series_editor';
@@ -246,18 +246,20 @@ export class TablePanelConfig extends Component<
                 </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiFormLabel htmlFor={htmlId('globalFilterOption')}>
-                  <FormattedMessage
-                    id="visTypeTimeseries.table.optionsTab.ignoreGlobalFilterLabel"
-                    defaultMessage="Ignore global filter?"
+                <EuiFormRow
+                  label={i18n.translate(
+                    'visTypeTimeseries.table.optionsTab.ignoreGlobalFilterLabel',
+                    {
+                      defaultMessage: 'Ignore global filter?',
+                    }
+                  )}
+                >
+                  <YesNo
+                    value={model.ignore_global_filter}
+                    name="ignore_global_filter"
+                    onChange={this.props.onChange}
                   />
-                </EuiFormLabel>
-                <EuiSpacer size="m" />
-                <YesNo
-                  value={model.ignore_global_filter}
-                  name="ignore_global_filter"
-                  onChange={this.props.onChange}
-                />
+                </EuiFormRow>
               </EuiFlexItem>
             </EuiFlexGroup>
           </EuiPanel>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.tsx b/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.tsx
index ae36408a08b46..ae9d7326140a7 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.tsx
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.tsx
@@ -5,6 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 
 import React, { Component } from 'react';
 import {
@@ -22,8 +24,6 @@ import {
   EuiTitle,
   EuiHorizontalRule,
 } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
 
 // @ts-expect-error not typed yet
 import { SeriesEditor } from '../series_editor';
@@ -212,18 +212,20 @@ export class TimeseriesPanelConfig extends Component<
                 </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiFormLabel>
-                  <FormattedMessage
-                    id="visTypeTimeseries.timeseries.optionsTab.ignoreGlobalFilterLabel"
-                    defaultMessage="Ignore global filter?"
+                <EuiFormRow
+                  label={i18n.translate(
+                    'visTypeTimeseries.timeseries.optionsTab.ignoreGlobalFilterLabel',
+                    {
+                      defaultMessage: 'Ignore global filter?',
+                    }
+                  )}
+                >
+                  <YesNo
+                    value={model.ignore_global_filter}
+                    name="ignore_global_filter"
+                    onChange={this.props.onChange}
                   />
-                </EuiFormLabel>
-                <EuiSpacer size="m" />
-                <YesNo
-                  value={model.ignore_global_filter}
-                  name="ignore_global_filter"
-                  onChange={this.props.onChange}
-                />
+                </EuiFormRow>
               </EuiFlexItem>
             </EuiFlexGroup>
           </EuiPanel>
@@ -333,19 +335,17 @@ export class TimeseriesPanelConfig extends Component<
                 />
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiFormLabel>
-                  <FormattedMessage
-                    id="visTypeTimeseries.timeseries.optionsTab.showLegendLabel"
-                    defaultMessage="Show legend?"
+                <EuiFormRow
+                  label={i18n.translate('visTypeTimeseries.timeseries.optionsTab.showLegendLabel', {
+                    defaultMessage: 'Show legend?',
+                  })}
+                >
+                  <YesNo
+                    value={model.show_legend}
+                    name="show_legend"
+                    onChange={this.props.onChange}
                   />
-                </EuiFormLabel>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <YesNo
-                  value={model.show_legend}
-                  name="show_legend"
-                  onChange={this.props.onChange}
-                />
+                </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
                 <EuiFormLabel htmlFor={htmlId('legendPos')}>
@@ -366,15 +366,16 @@ export class TimeseriesPanelConfig extends Component<
                 />
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiFormLabel>
-                  <FormattedMessage
-                    id="visTypeTimeseries.timeseries.optionsTab.displayGridLabel"
-                    defaultMessage="Display grid"
-                  />
-                </EuiFormLabel>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <YesNo value={model.show_grid} name="show_grid" onChange={this.props.onChange} />
+                <EuiFormRow
+                  label={i18n.translate(
+                    'visTypeTimeseries.timeseries.optionsTab.displayGridLabel',
+                    {
+                      defaultMessage: 'Display grid',
+                    }
+                  )}
+                >
+                  <YesNo value={model.show_grid} name="show_grid" onChange={this.props.onChange} />
+                </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
                 <EuiFormLabel>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/top_n.tsx b/src/plugins/vis_type_timeseries/public/application/components/panel_config/top_n.tsx
index a537a769cac11..30d65f6edd845 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/top_n.tsx
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/top_n.tsx
@@ -5,7 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component } from 'react';
 import uuid from 'uuid';
 import {
@@ -23,7 +24,6 @@ import {
   EuiHorizontalRule,
   EuiCode,
 } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
 
 // @ts-expect-error not typed yet
 import { SeriesEditor } from '../series_editor';
@@ -149,18 +149,20 @@ export class TopNPanelConfig extends Component<
                 </EuiFormRow>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiFormLabel>
-                  <FormattedMessage
-                    id="visTypeTimeseries.topN.optionsTab.ignoreGlobalFilterLabel"
-                    defaultMessage="Ignore global filter?"
+                <EuiFormRow
+                  label={i18n.translate(
+                    'visTypeTimeseries.topN.optionsTab.ignoreGlobalFilterLabel',
+                    {
+                      defaultMessage: 'Ignore global filter?',
+                    }
+                  )}
+                >
+                  <YesNo
+                    value={model.ignore_global_filter}
+                    name="ignore_global_filter"
+                    onChange={this.props.onChange}
                   />
-                </EuiFormLabel>
-                <EuiSpacer size="m" />
-                <YesNo
-                  value={model.ignore_global_filter}
-                  name="ignore_global_filter"
-                  onChange={this.props.onChange}
-                />
+                </EuiFormRow>
               </EuiFlexItem>
             </EuiFlexGroup>
           </EuiPanel>
diff --git a/src/plugins/vis_type_timeseries/public/application/components/series_config.js b/src/plugins/vis_type_timeseries/public/application/components/series_config.js
index 8f3893feb89bd..86781c9922e46 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/series_config.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/series_config.js
@@ -5,7 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { DataFormatPicker } from './data_format_picker';
@@ -21,10 +22,7 @@ import {
   EuiFormRow,
   EuiCode,
   EuiHorizontalRule,
-  EuiFormLabel,
-  EuiSpacer,
 } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
 import { SeriesConfigQueryBarWithIgnoreGlobalFilter } from './series_config_query_bar_with_ignore_global_filter';
 
 export const SeriesConfig = (props) => {
@@ -104,18 +102,17 @@ export const SeriesConfig = (props) => {
 
       <EuiFlexGroup gutterSize="s" responsive={false} wrap={true}>
         <EuiFlexItem grow={false}>
-          <EuiFormLabel>
-            <FormattedMessage
-              id="visTypeTimeseries.seriesConfig.overrideIndexPatternLabel"
-              defaultMessage="Override Index Pattern?"
+          <EuiFormRow
+            label={i18n.translate('visTypeTimeseries.seriesConfig.overrideIndexPatternLabel', {
+              defaultMessage: 'Override Index Pattern?',
+            })}
+          >
+            <YesNo
+              value={model.override_index_pattern}
+              name="override_index_pattern"
+              onChange={props.onChange}
             />
-          </EuiFormLabel>
-          <EuiSpacer size="s" />
-          <YesNo
-            value={model.override_index_pattern}
-            name="override_index_pattern"
-            onChange={props.onChange}
-          />
+          </EuiFormRow>
         </EuiFlexItem>
         <EuiFlexItem>
           <IndexPattern
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/config.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/config.js
index 1940ac8b2e9b9..094c33f131fd9 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/config.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/table/config.js
@@ -26,7 +26,6 @@ import {
   EuiFormRow,
   EuiCode,
   EuiHorizontalRule,
-  EuiFormLabel,
   EuiSpacer,
   EuiTitle,
 } from '@elastic/eui';
@@ -171,14 +170,17 @@ export class TableSeriesConfig extends Component {
             </EuiFormRow>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <EuiFormLabel>
-              <FormattedMessage
-                id="visTypeTimeseries.table.showTrendArrowsLabel"
-                defaultMessage="Show trend arrows?"
+            <EuiFormRow
+              label={i18n.translate('visTypeTimeseries.table.showTrendArrowsLabel', {
+                defaultMessage: 'Show trend arrows?',
+              })}
+            >
+              <YesNo
+                value={model.trend_arrows}
+                name="trend_arrows"
+                onChange={this.props.onChange}
               />
-            </EuiFormLabel>
-            <EuiSpacer size="s" />
-            <YesNo value={model.trend_arrows} name="trend_arrows" onChange={this.props.onChange} />
+            </EuiFormRow>
           </EuiFlexItem>
         </EuiFlexGroup>
 
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/config.js b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/config.js
index 1c3a0411998b0..ebb3141cb4c8c 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/config.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_types/timeseries/config.js
@@ -5,6 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import { i18n } from '@kbn/i18n';
 
 import PropTypes from 'prop-types';
 import React, { useState, useEffect } from 'react';
@@ -23,8 +24,6 @@ import {
   EuiCode,
   EuiHorizontalRule,
   EuiFieldNumber,
-  EuiFormLabel,
-  EuiSpacer,
 } from '@elastic/eui';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
 import { SeriesConfigQueryBarWithIgnoreGlobalFilter } from '../../series_config_query_bar_with_ignore_global_filter';
@@ -235,14 +234,13 @@ export const TimeseriesConfig = injectI18n(function (props) {
           </EuiFormRow>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <EuiFormLabel>
-            <FormattedMessage
-              id="visTypeTimeseries.timeSeries.chartLine.stepsLabel"
-              defaultMessage="Steps"
-            />
-          </EuiFormLabel>
-          <EuiSpacer size="s" />
-          <YesNo value={model.steps} name="steps" onChange={props.onChange} />
+          <EuiFormRow
+            label={i18n.translate('visTypeTimeseries.timeSeries.chartLine.stepsLabel', {
+              defaultMessage: 'Steps',
+            })}
+          >
+            <YesNo value={model.steps} name="steps" onChange={props.onChange} />
+          </EuiFormRow>
         </EuiFlexItem>
       </EuiFlexGroup>
     );
@@ -408,14 +406,13 @@ export const TimeseriesConfig = injectI18n(function (props) {
           </EuiFormRow>
         </EuiFlexItem>
         <EuiFlexItem grow={true}>
-          <EuiFormLabel>
-            <FormattedMessage
-              id="visTypeTimeseries.timeSeries.hideInLegendLabel"
-              defaultMessage="Hide in legend"
-            />
-          </EuiFormLabel>
-          <EuiSpacer size="s" />
-          <YesNo value={model.hide_in_legend} name="hide_in_legend" onChange={props.onChange} />
+          <EuiFormRow
+            label={i18n.translate('visTypeTimeseries.timeSeries.hideInLegendLabel', {
+              defaultMessage: 'Hide in legend',
+            })}
+          >
+            <YesNo value={model.hide_in_legend} name="hide_in_legend" onChange={props.onChange} />
+          </EuiFormRow>
         </EuiFlexItem>
         {palettesRegistry && (
           <EuiFlexItem grow={true}>
@@ -443,14 +440,13 @@ export const TimeseriesConfig = injectI18n(function (props) {
 
       <EuiFlexGroup responsive={false} wrap={true}>
         <EuiFlexItem grow={false}>
-          <EuiFormLabel>
-            <FormattedMessage
-              id="visTypeTimeseries.timeSeries.separateAxisLabel"
-              defaultMessage="Separate axis?"
-            />
-          </EuiFormLabel>
-          <EuiSpacer size="s" />
-          <YesNo value={model.separate_axis} name="separate_axis" onChange={props.onChange} />
+          <EuiFormRow
+            label={i18n.translate('visTypeTimeseries.timeSeries.separateAxisLabel', {
+              defaultMessage: 'Separate axis?',
+            })}
+          >
+            <YesNo value={model.separate_axis} name="separate_axis" onChange={props.onChange} />
+          </EuiFormRow>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
           <EuiFormRow
@@ -523,18 +519,17 @@ export const TimeseriesConfig = injectI18n(function (props) {
 
       <EuiFlexGroup gutterSize="s" responsive={false} wrap={true}>
         <EuiFlexItem grow={false}>
-          <EuiFormLabel>
-            <FormattedMessage
-              id="visTypeTimeseries.timeSeries.overrideIndexPatternLabel"
-              defaultMessage="Override Index Pattern?"
+          <EuiFormRow
+            label={i18n.translate('visTypeTimeseries.timeSeries.overrideIndexPatternLabel', {
+              defaultMessage: 'Override Index Pattern?',
+            })}
+          >
+            <YesNo
+              value={model.override_index_pattern}
+              name="override_index_pattern"
+              onChange={props.onChange}
             />
-          </EuiFormLabel>
-          <EuiSpacer size="s" />
-          <YesNo
-            value={model.override_index_pattern}
-            name="override_index_pattern"
-            onChange={props.onChange}
-          />
+          </EuiFormRow>
         </EuiFlexItem>
         <EuiFlexItem>
           <IndexPattern