diff --git a/cypress/integration/bucket_level_monitor_spec.js b/cypress/integration/bucket_level_monitor_spec.js
index 766bdba6b..1d8077af0 100644
--- a/cypress/integration/bucket_level_monitor_spec.js
+++ b/cypress/integration/bucket_level_monitor_spec.js
@@ -338,8 +338,8 @@ describe('Bucket-Level Monitors', () => {
         // Add a trigger
         addTriggerToVisualEditorMonitor(SAMPLE_TRIGGER, 0, SAMPLE_ACTION, true);
 
-        // Click save to save monitor changes
-        cy.get('button').contains('Save').last().click({ force: true });
+        // Click update button to save monitor changes
+        cy.get('button').contains('Update').last().click({ force: true });
 
         // Confirm we can see only one row in the trigger list by checking <caption> element
         cy.contains('This table contains 1 row');
@@ -375,8 +375,8 @@ describe('Bucket-Level Monitors', () => {
           timeout: 25000,
         });
 
-        // Click the save button
-        cy.get('button').contains('Save').last().click({ force: true });
+        // Click the update button
+        cy.get('button').contains('Update').last().click({ force: true });
 
         // Confirm we're on the Monitor Details page by searching for the History element
         cy.contains('History', { timeout: 20000 });
diff --git a/cypress/integration/cluster_metrics_monitor_spec.js b/cypress/integration/cluster_metrics_monitor_spec.js
index 2ba38e5bf..e66145e7c 100644
--- a/cypress/integration/cluster_metrics_monitor_spec.js
+++ b/cypress/integration/cluster_metrics_monitor_spec.js
@@ -369,8 +369,8 @@ describe('ClusterMetricsMonitor', () => {
           'ctx.results[0].number_of_pending_tasks >= 0'
         );
 
-        // Click save button to save monitor changes
-        cy.get('button').contains('Save').last().click({ force: true });
+        // Click update button to save monitor changes
+        cy.get('button').contains('Update').last().click({ force: true });
 
         // Confirm we can see only one row in the trigger list by checking <caption> element
         cy.contains('This table contains 1 row');
diff --git a/cypress/integration/composite_level_monitor_spec.js b/cypress/integration/composite_level_monitor_spec.js
index 9bf785dea..4ef877d73 100644
--- a/cypress/integration/composite_level_monitor_spec.js
+++ b/cypress/integration/composite_level_monitor_spec.js
@@ -130,7 +130,6 @@ describe('CompositeLevelMonitor', () => {
 
     it('by visual editor', () => {
       // Verify edit page
-      cy.contains('Edit').click({ force: true });
       cy.contains('Edit monitor', { timeout: 20000 });
       cy.get('input[name="name"]').type('_edited');
 
@@ -151,7 +150,7 @@ describe('CompositeLevelMonitor', () => {
         .type('{enter}');
 
       cy.intercept('api/alerting/workflows/*').as('updateMonitorRequest');
-      cy.get('button').contains('Save').click({ force: true });
+      cy.get('button').contains('Update').click({ force: true });
 
       // Wait for monitor to be created
       cy.wait('@updateMonitorRequest').then(() => {
diff --git a/cypress/integration/document_level_monitor_spec.js b/cypress/integration/document_level_monitor_spec.js
index f43c3930f..9e82db039 100644
--- a/cypress/integration/document_level_monitor_spec.js
+++ b/cypress/integration/document_level_monitor_spec.js
@@ -380,8 +380,8 @@ describe('DocumentLevelMonitor', () => {
 
         // TODO: Test with Notifications plugin
 
-        // Click the save button
-        cy.get('button').contains('Save').last().click({ force: true });
+        // Click the update button
+        cy.get('button').contains('Update').last().click({ force: true });
 
         // Confirm we can see only one row in the trigger list by checking <caption> element
         cy.contains('This table contains 2 rows');
@@ -446,8 +446,8 @@ describe('DocumentLevelMonitor', () => {
 
         // TODO: Test with Notifications plugin
 
-        // Click the save button
-        cy.get('button').contains('Save').last().click({ force: true });
+        // Click the create button
+        cy.get('button').contains('Update').last().click({ force: true });
 
         // Confirm we can see only one row in the trigger list by checking <caption> element
         cy.contains('This table contains 1 row');
@@ -489,8 +489,8 @@ describe('DocumentLevelMonitor', () => {
         cy.get('[data-test-subj="indicesComboBox"]').should('not.have.text', TESTING_INDEX_A);
         cy.get('[data-test-subj="indicesComboBox"]').contains(TESTING_INDEX_B, { timeout: 20000 });
 
-        // Click the save button
-        cy.get('button').contains('Save').last().click({ force: true });
+        // Click the update button
+        cy.get('button').contains('Update').last().click({ force: true });
 
         // Confirm we're on the Monitor Details page by searching for the History element
         cy.contains('History', { timeout: 20000 });
diff --git a/cypress/integration/query_level_monitor_spec.js b/cypress/integration/query_level_monitor_spec.js
index 57f1af4c4..6743d7d1a 100644
--- a/cypress/integration/query_level_monitor_spec.js
+++ b/cypress/integration/query_level_monitor_spec.js
@@ -178,8 +178,8 @@ describe('Query-Level Monitors', () => {
         .clear()
         .type(UPDATED_MONITOR, { force: true });
 
-      // Click save button
-      cy.get('button').contains('Save').last().click({ force: true });
+      // Click Update button
+      cy.get('button').contains('Update').last().click({ force: true });
 
       // Confirm the update process is done and the page loaded
       cy.contains('Edit monitor');
@@ -222,8 +222,8 @@ describe('Query-Level Monitors', () => {
         timeout: 25000,
       });
 
-      // Click the save button
-      cy.get('button').contains('Save').last().click();
+      // Click the update button
+      cy.get('button').contains('Update').last().click();
 
       // Confirm we're on the Monitor Details page by searching for the History element
       cy.contains('History', { timeout: 25000 });
@@ -339,8 +339,8 @@ describe('Query-Level Monitors', () => {
         addVisualQueryLevelTrigger(trigger.name, i, true, `IS ${trigger.enum}`, `${i}`);
       }
 
-      // Click save button
-      cy.get('button').contains('Save').last().click({ force: true });
+      // Click Update button
+      cy.get('button').contains('Update').last().click({ force: true });
 
       // Confirm we can see the correct number of rows in the trigger list by checking <caption> element
       cy.contains(`This table contains ${triggers.length} rows`, { timeout: 25000 });
diff --git a/public/components/Breadcrumbs/Breadcrumbs.js b/public/components/Breadcrumbs/Breadcrumbs.js
index 1fc731295..45640e466 100644
--- a/public/components/Breadcrumbs/Breadcrumbs.js
+++ b/public/components/Breadcrumbs/Breadcrumbs.js
@@ -82,8 +82,8 @@ export async function getBreadcrumb(route, routeState, httpClient) {
           console.error(err);
         }
         const breadcrumbs = [{ text: monitorName, href: `/monitors/${base}` }];
-        if (action === MONITOR_ACTIONS.EDIT_MONITOR)
-          breadcrumbs.push({ text: 'Edit monitor', href: '/' });
+        if (action === MONITOR_ACTIONS.UPDATE_MONITOR)
+          breadcrumbs.push({ text: 'Update monitor', href: '/' });
         if (action === TRIGGER_ACTIONS.CREATE_TRIGGER)
           breadcrumbs.push({ text: 'Create trigger', href: '/' });
         if (action === TRIGGER_ACTIONS.UPDATE_TRIGGER)
diff --git a/public/components/Breadcrumbs/Breadcrumbs.test.js b/public/components/Breadcrumbs/Breadcrumbs.test.js
index a2921166b..045fc4faa 100644
--- a/public/components/Breadcrumbs/Breadcrumbs.test.js
+++ b/public/components/Breadcrumbs/Breadcrumbs.test.js
@@ -102,7 +102,7 @@ describe('getBreadcrumb', () => {
       httpClientMock.get.mockResolvedValue({ ok: true, resp: { name: 'random_name' } });
       expect(
         await getBreadcrumb(
-          `${monitorId}?action=${MONITOR_ACTIONS.EDIT_MONITOR}`,
+          `${monitorId}?action=${MONITOR_ACTIONS.UPDATE_MONITOR}`,
           {},
           httpClientMock
         )
diff --git a/public/components/Breadcrumbs/__snapshots__/Breadcrumbs.test.js.snap b/public/components/Breadcrumbs/__snapshots__/Breadcrumbs.test.js.snap
index 7082b7064..c649707d3 100644
--- a/public/components/Breadcrumbs/__snapshots__/Breadcrumbs.test.js.snap
+++ b/public/components/Breadcrumbs/__snapshots__/Breadcrumbs.test.js.snap
@@ -70,7 +70,7 @@ Array [
   },
   Object {
     "href": "/",
-    "text": "Edit monitor",
+    "text": "Update monitor",
   },
 ]
 `;
diff --git a/public/components/ContentPanel/ContentPanel.js b/public/components/ContentPanel/ContentPanel.js
index 4baa8c1c8..445b05183 100644
--- a/public/components/ContentPanel/ContentPanel.js
+++ b/public/components/ContentPanel/ContentPanel.js
@@ -19,7 +19,7 @@ const ContentPanel = ({
   children,
   panelOptions = {},
 }) => (
-  <EuiPanel style={{ padding: '16px', ...panelStyles }}>
+  <EuiPanel style={{ paddingLeft: '0px', paddingRight: '0px', ...panelStyles }}>
     <EuiFlexGroup style={{ padding: '0px 10px' }} justifyContent="spaceBetween" alignItems="center">
       <EuiFlexItem>
         <EuiText size={titleSize}>
diff --git a/public/components/ContentPanel/__snapshots__/ContentPanel.test.js.snap b/public/components/ContentPanel/__snapshots__/ContentPanel.test.js.snap
index 6c3fe1fe8..4efb999c3 100644
--- a/public/components/ContentPanel/__snapshots__/ContentPanel.test.js.snap
+++ b/public/components/ContentPanel/__snapshots__/ContentPanel.test.js.snap
@@ -3,7 +3,7 @@
 exports[`ContentPanel renders 1`] = `
 <div
   class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
-  style="padding:16px"
+  style="padding-left:0px;padding-right:0px"
 >
   <div
     class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
diff --git a/public/components/DataSourceAlertsCard/DataSourceAlertsCard.tsx b/public/components/DataSourceAlertsCard/DataSourceAlertsCard.tsx
index 6dd41b899..c8ae3434a 100644
--- a/public/components/DataSourceAlertsCard/DataSourceAlertsCard.tsx
+++ b/public/components/DataSourceAlertsCard/DataSourceAlertsCard.tsx
@@ -11,7 +11,6 @@ import { dataSourceFilterFn, getSeverityColor, getSeverityBadgeText, getTruncate
 import { renderTime } from "../../pages/Dashboard/utils/tableUtils";
 import { ALERTS_NAV_ID, MONITORS_NAV_ID } from "../../../utils/constants";
 import { APP_PATH, DEFAULT_EMPTY_DATA } from "../../utils/constants";
-import { dataSourceEnabled, getURL } from "../../pages/utils/helpers.js";
 
 export interface DataSourceAlertsCardProps {
   getDataSourceMenu?: DataSourceManagementPluginSetup['ui']['getDataSourceMenu'];
@@ -32,7 +31,7 @@ export const DataSourceAlertsCard: React.FC<DataSourceAlertsCardProps> =  ({ get
       query: {
         size: 25,
         sortField: 'start_time',
-        ...(dataSourceEnabled() && { dataSourceId: dataSource?.id || ''}),
+        dataSourceId: dataSource?.id || '',
         sortDirection: 'desc'
       }
     }).then(res => {
@@ -54,10 +53,6 @@ export const DataSourceAlertsCard: React.FC<DataSourceAlertsCardProps> =  ({ get
   const createAlertDetailsHeader = useCallback((alert) => {
     const severityColor = getSeverityColor(alert.severity);
     const triggerName = alert.trigger_name ?? DEFAULT_EMPTY_DATA;
-    const monitorUrl = `${MONITORS_NAV_ID}#/monitors/${
-      alert.alert_source === 'workflow' ? alert.workflow_id : alert.monitor_id
-    }?&type=${alert.alert_source}`;
-    const url = getURL(monitorUrl, dataSource?.id);
 
     return (
       <EuiFlexGroup gutterSize="s" justifyContent="spaceBetween" alignItems="center">
@@ -65,11 +60,7 @@ export const DataSourceAlertsCard: React.FC<DataSourceAlertsCardProps> =  ({ get
           <div>
             <EuiBadge color={severityColor?.background} style={{ padding: '1px 4px', color: severityColor?.text }}>{getSeverityBadgeText(alert.severity)}</EuiBadge>
             &nbsp;&nbsp;
-            <EuiLink href={url}>
-              <span style={{ color: '#006BB4' }} className="eui-textTruncate">
-                {getTruncatedText(triggerName)}
-              </span>
-            </EuiLink>
+            <span style={{ color: "#006BB4" }} className="eui-textTruncate">{getTruncatedText(triggerName)}</span>
           </div>
         </EuiFlexItem>
         <EuiFlexItem grow={false} >
@@ -88,8 +79,8 @@ export const DataSourceAlertsCard: React.FC<DataSourceAlertsCardProps> =  ({ get
           <EuiFlexItem grow={false}>
             <EuiText size="s" color="subdued">Monitor:</EuiText>
           </EuiFlexItem>
-          <EuiFlexItem grow={false} style={{ overflow: 'hidden', textOverflow: 'ellipsis' }}>
-            <EuiText size="m" style={{ overflow: 'hidden', textOverflow: 'ellipsis' }}>{monitorName}</EuiText>
+          <EuiFlexItem grow={false} >
+            <EuiText size="m">{getTruncatedText(monitorName)}</EuiText>
           </EuiFlexItem>
         </EuiFlexGroup>
         <EuiHorizontalRule margin="xs" />
@@ -105,7 +96,7 @@ export const DataSourceAlertsCard: React.FC<DataSourceAlertsCardProps> =  ({ get
   });
 
   return (
-    <EuiPanel hasBorder={false} hasShadow={false} style={{ overflow: 'hidden' }}>
+    <EuiPanel hasBorder={false} hasShadow={false}>
       <EuiFlexGroup style={{ height: '100%' }} direction="column" justifyContent="spaceBetween" alignItems="flexStart" gutterSize="xs">
         <EuiFlexItem grow={false} style={{ width: '100%', height: '90%' }}>
           <EuiFlexGroup direction="column" style={{ height: '100%' }}>
@@ -156,7 +147,7 @@ export const DataSourceAlertsCard: React.FC<DataSourceAlertsCardProps> =  ({ get
           </EuiFlexGroup>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <EuiLink href={getApplication().getUrlForApp(ALERTS_NAV_ID, { path: '#/dashboard' })}><EuiText size="s" className="eui-displayInline">View all</EuiText></EuiLink>
+          <EuiLink href={getApplication().getUrlForApp(ALERTS_NAV_ID, { path: '#/dashboard' })} target="_blank"><EuiText size="s" className="eui-displayInline">View all</EuiText></EuiLink>
         </EuiFlexItem>
       </EuiFlexGroup>
     </EuiPanel>
diff --git a/public/components/Flyout/flyouts/components/AlertsDashboardFlyoutComponent.js b/public/components/Flyout/flyouts/components/AlertsDashboardFlyoutComponent.js
index de91f1793..0a97b8c31 100644
--- a/public/components/Flyout/flyouts/components/AlertsDashboardFlyoutComponent.js
+++ b/public/components/Flyout/flyouts/components/AlertsDashboardFlyoutComponent.js
@@ -455,8 +455,8 @@ export default class AlertsDashboardFlyoutComponent extends Component {
           onPageChange={this.onPageClick}
           isAlertsFlyout={true}
           monitorType={monitorType}
-          panelStyles={{ padding: '8px 0px 16px' }}
         />
+        <EuiHorizontalRule margin="xs" />
         <EuiBasicTable
           items={loading ? [] : trimmedAlerts}
           /*
diff --git a/public/components/Flyout/flyouts/components/__snapshots__/AlertsDashboardFlyoutComponent.test.js.snap b/public/components/Flyout/flyouts/components/__snapshots__/AlertsDashboardFlyoutComponent.test.js.snap
index 13b85637e..a34f10592 100644
--- a/public/components/Flyout/flyouts/components/__snapshots__/AlertsDashboardFlyoutComponent.test.js.snap
+++ b/public/components/Flyout/flyouts/components/__snapshots__/AlertsDashboardFlyoutComponent.test.js.snap
@@ -202,15 +202,13 @@ exports[`AlertsDashboardFlyoutComponent renders 1`] = `
       onSearchChange={[Function]}
       onStateChange={[Function]}
       pageCount={1}
-      panelStyles={
-        Object {
-          "padding": "8px 0px 16px",
-        }
-      }
       search=""
       severity="ALL"
       state="ALL"
     />
+    <EuiHorizontalRule
+      margin="xs"
+    />
     <EuiBasicTable
       columns={
         Array [
diff --git a/public/pages/CreateMonitor/components/QueryPerformance/__snapshots__/QueryPerformance.test.js.snap b/public/pages/CreateMonitor/components/QueryPerformance/__snapshots__/QueryPerformance.test.js.snap
index 3ccb11d77..829064713 100644
--- a/public/pages/CreateMonitor/components/QueryPerformance/__snapshots__/QueryPerformance.test.js.snap
+++ b/public/pages/CreateMonitor/components/QueryPerformance/__snapshots__/QueryPerformance.test.js.snap
@@ -3,7 +3,7 @@
 exports[`QueryPerformance renders 1`] = `
 <div
   class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
-  style="padding:16px;padding-left:10px;padding-right:10px"
+  style="padding-left:10px;padding-right:10px"
 >
   <div
     class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
diff --git a/public/pages/CreateMonitor/components/VisualGraph/__snapshots__/VisualGraph.test.js.snap b/public/pages/CreateMonitor/components/VisualGraph/__snapshots__/VisualGraph.test.js.snap
index 00f666753..1075ee065 100644
--- a/public/pages/CreateMonitor/components/VisualGraph/__snapshots__/VisualGraph.test.js.snap
+++ b/public/pages/CreateMonitor/components/VisualGraph/__snapshots__/VisualGraph.test.js.snap
@@ -3,7 +3,7 @@
 exports[`VisualGraph renders 1`] = `
 <div
   class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
-  style="padding:16px;padding-left:10px"
+  style="padding-left:10px;padding-right:0px"
 >
   <div
     class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
@@ -544,7 +544,7 @@ exports[`VisualGraph renders 1`] = `
 exports[`VisualGraph renders with bucket level monitor 1`] = `
 <div
   class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
-  style="padding:16px;padding-left:10px"
+  style="padding-left:10px;padding-right:0px"
 >
   <div
     class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
diff --git a/public/pages/CreateMonitor/containers/CreateMonitor/CreateMonitor.js b/public/pages/CreateMonitor/containers/CreateMonitor/CreateMonitor.js
index eedef7099..46cf80ed3 100644
--- a/public/pages/CreateMonitor/containers/CreateMonitor/CreateMonitor.js
+++ b/public/pages/CreateMonitor/containers/CreateMonitor/CreateMonitor.js
@@ -177,7 +177,7 @@ export default class CreateMonitor extends Component {
     } = this.props;
     const { createModalOpen, initialValues, plugins } = this.state;
     return (
-      <div style={{ padding: '16px' }}>
+      <div style={{ padding: '25px 50px' }}>
         <Formik
           initialValues={initialValues}
           onSubmit={this.evaluateSubmission}
@@ -268,7 +268,7 @@ export default class CreateMonitor extends Component {
                       </EuiFlexItem>
                       <EuiFlexItem grow={false}>
                         <EuiSmallButton fill onClick={handleSubmit} isLoading={isSubmitting}>
-                          {edit ? 'Save' : 'Create'}
+                          {edit ? 'Update' : 'Create'}
                         </EuiSmallButton>
                       </EuiFlexItem>
                     </EuiFlexGroup>
diff --git a/public/pages/CreateMonitor/containers/CreateMonitor/__snapshots__/CreateMonitor.test.js.snap b/public/pages/CreateMonitor/containers/CreateMonitor/__snapshots__/CreateMonitor.test.js.snap
index 32f594204..a7f3b3507 100644
--- a/public/pages/CreateMonitor/containers/CreateMonitor/__snapshots__/CreateMonitor.test.js.snap
+++ b/public/pages/CreateMonitor/containers/CreateMonitor/__snapshots__/CreateMonitor.test.js.snap
@@ -4,7 +4,7 @@ exports[`CreateMonitor renders 1`] = `
 <div
   style={
     Object {
-      "padding": "16px",
+      "padding": "25px 50px",
     }
   }
 >
diff --git a/public/pages/CreateMonitor/containers/DataSource/DataSource.js b/public/pages/CreateMonitor/containers/DataSource/DataSource.js
index fdf159e7a..c7daff3e8 100644
--- a/public/pages/CreateMonitor/containers/DataSource/DataSource.js
+++ b/public/pages/CreateMonitor/containers/DataSource/DataSource.js
@@ -65,6 +65,7 @@ class DataSource extends Component {
       <ContentPanel
         title="Select data"
         titleSize="s"
+        panelStyles={{ paddingLeft: '10px', paddingRight: '10px' }}
         bodyStyles={{ padding: 'initial' }}
       >
         {monitorIndexDisplay}
diff --git a/public/pages/CreateMonitor/containers/DataSource/__snapshots__/DataSource.test.js.snap b/public/pages/CreateMonitor/containers/DataSource/__snapshots__/DataSource.test.js.snap
index 2c6902d8a..f66def69a 100644
--- a/public/pages/CreateMonitor/containers/DataSource/__snapshots__/DataSource.test.js.snap
+++ b/public/pages/CreateMonitor/containers/DataSource/__snapshots__/DataSource.test.js.snap
@@ -7,6 +7,12 @@ exports[`DataSource renders 1`] = `
       "padding": "initial",
     }
   }
+  panelStyles={
+    Object {
+      "paddingLeft": "10px",
+      "paddingRight": "10px",
+    }
+  }
   title="Select data"
   titleSize="s"
 >
diff --git a/public/pages/CreateMonitor/containers/DefineMonitor/DefineMonitor.js b/public/pages/CreateMonitor/containers/DefineMonitor/DefineMonitor.js
index 96dd6cc4e..b0284aae5 100644
--- a/public/pages/CreateMonitor/containers/DefineMonitor/DefineMonitor.js
+++ b/public/pages/CreateMonitor/containers/DefineMonitor/DefineMonitor.js
@@ -702,6 +702,10 @@ class DefineMonitor extends Component {
         <PanelComponent
           title="Query"
           titleSize="s"
+          panelStyles={{
+            paddingLeft: '10px',
+            paddingRight: '10px',
+          }}
           bodyStyles={{ padding: 'initial' }}
           actions={monitorContent.actions}
         >
diff --git a/public/pages/CreateMonitor/containers/DefineMonitor/__snapshots__/DefineMonitor.test.js.snap b/public/pages/CreateMonitor/containers/DefineMonitor/__snapshots__/DefineMonitor.test.js.snap
index 09fd36867..f4339f1e4 100644
--- a/public/pages/CreateMonitor/containers/DefineMonitor/__snapshots__/DefineMonitor.test.js.snap
+++ b/public/pages/CreateMonitor/containers/DefineMonitor/__snapshots__/DefineMonitor.test.js.snap
@@ -91,6 +91,12 @@ exports[`DefineMonitor renders 1`] = `
         "padding": "initial",
       }
     }
+    panelStyles={
+      Object {
+        "paddingLeft": "10px",
+        "paddingRight": "10px",
+      }
+    }
     title="Query"
     titleSize="s"
   >
@@ -138,6 +144,12 @@ exports[`DefineMonitor should show warning in case of Ad monitor and plugin is n
         "padding": "initial",
       }
     }
+    panelStyles={
+      Object {
+        "paddingLeft": "10px",
+        "paddingRight": "10px",
+      }
+    }
     title="Query"
     titleSize="s"
   >
diff --git a/public/pages/CreateMonitor/containers/MonitorDetails/MonitorDetails.js b/public/pages/CreateMonitor/containers/MonitorDetails/MonitorDetails.js
index 95e397863..04d1b10fd 100644
--- a/public/pages/CreateMonitor/containers/MonitorDetails/MonitorDetails.js
+++ b/public/pages/CreateMonitor/containers/MonitorDetails/MonitorDetails.js
@@ -63,7 +63,12 @@ const MonitorDetails = ({
     <Container
       title="Monitor details"
       titleSize="s"
-      panelStyles={{ padding: '16px' }}
+      panelStyles={{
+        paddingBottom: '20px',
+        paddingLeft: '10px',
+        paddingRight: '10px',
+        paddingTop: '20px',
+      }}
       actions={anomalyDetectorContent.actions}
     >
       {!flyoutMode && <EuiSpacer size="s" />}
diff --git a/public/pages/CreateMonitor/containers/WorkflowDetails/__snapshots__/WorkflowDetails.test.js.snap b/public/pages/CreateMonitor/containers/WorkflowDetails/__snapshots__/WorkflowDetails.test.js.snap
index 16ab04200..65b8caa32 100644
--- a/public/pages/CreateMonitor/containers/WorkflowDetails/__snapshots__/WorkflowDetails.test.js.snap
+++ b/public/pages/CreateMonitor/containers/WorkflowDetails/__snapshots__/WorkflowDetails.test.js.snap
@@ -3,7 +3,7 @@
 exports[`WorkflowDetails renders 1`] = `
 <div
   class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
-  style="padding:16px;padding-bottom:20px;padding-left:10px;padding-right:10px;padding-top:20px"
+  style="padding-left:10px;padding-right:10px;padding-bottom:20px;padding-top:20px"
 >
   <div
     class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
diff --git a/public/pages/CreateTrigger/containers/ConfigureTriggers/ConfigureTriggers.js b/public/pages/CreateTrigger/containers/ConfigureTriggers/ConfigureTriggers.js
index 601b87630..199063e76 100644
--- a/public/pages/CreateTrigger/containers/ConfigureTriggers/ConfigureTriggers.js
+++ b/public/pages/CreateTrigger/containers/ConfigureTriggers/ConfigureTriggers.js
@@ -453,7 +453,7 @@ class ConfigureTriggers extends React.Component {
             ? 'Triggers define the conditions that determine when a composite monitor should generate its own alert.'
             : undefined
         }
-        panelStyles={{ padding: '16px' }}
+        panelStyles={{ paddingBottom: '0px', paddingLeft: '20px', paddingRight: '20px' }}
         bodyStyles={{ paddingLeft: '0px', padding: '10px' }}
         horizontalRuleClassName={'accordion-horizontal-rule'}
       >
diff --git a/public/pages/Dashboard/components/AcknowledgeAlertsModal/AcknowledgeAlertsModal.js b/public/pages/Dashboard/components/AcknowledgeAlertsModal/AcknowledgeAlertsModal.js
index e9dae71f0..a839d9c13 100644
--- a/public/pages/Dashboard/components/AcknowledgeAlertsModal/AcknowledgeAlertsModal.js
+++ b/public/pages/Dashboard/components/AcknowledgeAlertsModal/AcknowledgeAlertsModal.js
@@ -227,7 +227,7 @@ export default class AcknowledgeAlertsModal extends Component {
   onCreateTrigger = () => {
     const { history, monitorId, onClose } = this.props;
     onClose();
-    history.push(`/monitors/${monitorId}?action=${MONITOR_ACTIONS.EDIT_MONITOR}`);
+    history.push(`/monitors/${monitorId}?action=${MONITOR_ACTIONS.UPDATE_MONITOR}`);
   };
 
   render() {
diff --git a/public/pages/Dashboard/components/DashboardControls/DashboardControls.js b/public/pages/Dashboard/components/DashboardControls/DashboardControls.js
index fc9118b08..c1d38190a 100644
--- a/public/pages/Dashboard/components/DashboardControls/DashboardControls.js
+++ b/public/pages/Dashboard/components/DashboardControls/DashboardControls.js
@@ -45,7 +45,6 @@ const DashboardControls = ({
   isAlertsFlyout = false,
   monitorType,
   alertActions = [],
-  panelStyles = {},
 }) => {
   let supportedStateOptions = stateOptions;
   switch (monitorType) {
@@ -57,7 +56,7 @@ const DashboardControls = ({
       break;
   }
   return (
-    <EuiFlexGroup style={{ padding: '0px 0px 16px', ...panelStyles }} gutterSize="s">
+    <EuiFlexGroup style={{ padding: '0px 5px' }} gutterSize="s">
       <EuiFlexItem>
         <EuiCompressedFieldSearch
           fullWidth={true}
@@ -88,6 +87,9 @@ const DashboardControls = ({
       {alertActions.map((action, idx) => (
         <EuiFlexItem grow={false}>{action}</EuiFlexItem>
       ))}
+      <EuiFlexItem grow={false} style={{ justifyContent: 'center' }}>
+        <EuiPagination pageCount={pageCount} activePage={activePage} onPageClick={onPageChange} />
+      </EuiFlexItem>
     </EuiFlexGroup>
   );
 };
diff --git a/public/pages/Dashboard/components/DashboardControls/__snapshots__/DashboardControls.test.js.snap b/public/pages/Dashboard/components/DashboardControls/__snapshots__/DashboardControls.test.js.snap
index f15dbc8d7..4809833ca 100644
--- a/public/pages/Dashboard/components/DashboardControls/__snapshots__/DashboardControls.test.js.snap
+++ b/public/pages/Dashboard/components/DashboardControls/__snapshots__/DashboardControls.test.js.snap
@@ -3,7 +3,7 @@
 exports[`DashboardControls renders 1`] = `
 <div
   class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
-  style="padding:0px 0px 16px"
+  style="padding:0px 5px"
 >
   <div
     class="euiFlexItem"
@@ -151,5 +151,81 @@ exports[`DashboardControls renders 1`] = `
       </div>
     </div>
   </div>
+  <div
+    class="euiFlexItem euiFlexItem--flexGrowZero"
+    style="justify-content:center"
+  >
+    <nav
+      class="euiPagination"
+    >
+      <button
+        aria-label="Previous page, 1"
+        class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
+        data-test-subj="pagination-button-previous"
+        type="button"
+      >
+        <div>
+          EuiIconMock
+        </div>
+      </button>
+      <ul
+        class="euiPagination__list"
+      >
+        <li
+          class="euiPagination__item"
+        >
+          <button
+            aria-label="Page 1 of 2"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
+            data-test-subj="pagination-button-0"
+            type="button"
+          >
+            <span
+              class="euiButtonContent euiButtonEmpty__content"
+            >
+              <span
+                class="euiButtonEmpty__text"
+              >
+                1
+              </span>
+            </span>
+          </button>
+        </li>
+        <li
+          class="euiPagination__item"
+        >
+          <button
+            aria-current="true"
+            aria-label="Page 2 of 2"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+            data-test-subj="pagination-button-1"
+            disabled=""
+            type="button"
+          >
+            <span
+              class="euiButtonContent euiButtonEmpty__content"
+            >
+              <span
+                class="euiButtonEmpty__text"
+              >
+                2
+              </span>
+            </span>
+          </button>
+        </li>
+      </ul>
+      <button
+        aria-label="Next page"
+        class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
+        data-test-subj="pagination-button-next"
+        disabled=""
+        type="button"
+      >
+        <div>
+          EuiIconMock
+        </div>
+      </button>
+    </nav>
+  </div>
 </div>
 `;
diff --git a/public/pages/Dashboard/containers/Dashboard.js b/public/pages/Dashboard/containers/Dashboard.js
index 2005bee81..0838fe007 100644
--- a/public/pages/Dashboard/containers/Dashboard.js
+++ b/public/pages/Dashboard/containers/Dashboard.js
@@ -9,12 +9,10 @@ import queryString from 'query-string';
 import {
   EuiBasicTable,
   EuiSmallButton,
+  EuiHorizontalRule,
   EuiIcon,
   EuiToolTip,
   EuiSmallButtonIcon,
-  EuiFlexItem,
-  EuiPagination,
-  EuiFlexGroup,
 } from '@elastic/eui';
 import ContentPanel from '../../../components/ContentPanel';
 import DashboardEmptyPrompt from '../components/DashboardEmptyPrompt';
@@ -532,7 +530,6 @@ export default class Dashboard extends Component {
     };
 
     const useUpdatedUx = !perAlertView && getUseUpdatedUx();
-    const shouldShowPagination = !perAlertView && totalAlerts > 0;
 
     return (
       <>
@@ -549,7 +546,6 @@ export default class Dashboard extends Component {
           bodyStyles={{ padding: 'initial' }}
           actions={useUpdatedUx ? undefined : actions()}
           panelOptions={{ hideTitleBorder: useUpdatedUx }}
-          panelStyles={{ padding: useUpdatedUx && totalAlerts < 1 ? '16px 16px 0px' : '16px' }}
         >
           <DashboardControls
             activePage={page}
@@ -564,9 +560,10 @@ export default class Dashboard extends Component {
             isAlertsFlyout={isAlertsFlyout}
             monitorType={monitorType}
             alertActions={useUpdatedUx ? actions() : undefined}
-            panelStyles={{ padding: perAlertView ? '8px 0px 16px' : '0px 0px 16px' }}
           />
 
+          <EuiHorizontalRule margin="xs" />
+
           <EuiBasicTable
             items={perAlertView ? alerts : alertsByTriggers}
             /*
@@ -585,18 +582,6 @@ export default class Dashboard extends Component {
             data-test-subj={'alertsDashboard_table'}
           />
 
-          {shouldShowPagination && (
-            <EuiFlexGroup justifyContent="flexEnd" style={{ padding: '8px 0px 0px' }}>
-              <EuiFlexItem grow={false}>
-                <EuiPagination
-                  pageCount={Math.ceil(totalItems / size) || 1}
-                  activePage={page}
-                  onPageClick={this.onPageClick}
-                />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          )}
-
           {this.state.showAlertsModal && this.renderModal()}
         </ContentPanel>
       </>
diff --git a/public/pages/Dashboard/containers/FindingsDashboard.js b/public/pages/Dashboard/containers/FindingsDashboard.js
index 0bd386aef..61414901b 100644
--- a/public/pages/Dashboard/containers/FindingsDashboard.js
+++ b/public/pages/Dashboard/containers/FindingsDashboard.js
@@ -206,7 +206,7 @@ export default class FindingsDashboard extends Component {
         bodyStyles={{ padding: 'initial' }}
       >
         {!isPreview && (
-          <EuiFlexGroup style={{ padding: '8px 0px 16px' }}>
+          <EuiFlexGroup style={{ padding: '0px 5px' }}>
             <EuiFlexItem>
               <EuiCompressedFieldSearch
                 fullWidth={true}
@@ -229,6 +229,8 @@ export default class FindingsDashboard extends Component {
           </EuiFlexGroup>
         )}
 
+        <EuiHorizontalRule margin={'xs'} />
+
         <EuiBasicTable
           items={loadingFindings ? [] : paginatedFindings}
           itemId={getItemId}
diff --git a/public/pages/Dashboard/containers/__snapshots__/Dashboard.test.js.snap b/public/pages/Dashboard/containers/__snapshots__/Dashboard.test.js.snap
index a80332448..575374ee4 100644
--- a/public/pages/Dashboard/containers/__snapshots__/Dashboard.test.js.snap
+++ b/public/pages/Dashboard/containers/__snapshots__/Dashboard.test.js.snap
@@ -113,18 +113,14 @@ exports[`Dashboard renders in flyout 1`] = `
         "hideTitleBorder": false,
       }
     }
-    panelStyles={
-      Object {
-        "padding": "16px",
-      }
-    }
     title="Alerts"
     titleSize="s"
   >
     <EuiPanel
       style={
         Object {
-          "padding": "16px",
+          "paddingLeft": "0px",
+          "paddingRight": "0px",
         }
       }
     >
@@ -132,7 +128,8 @@ exports[`Dashboard renders in flyout 1`] = `
         className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
         style={
           Object {
-            "padding": "16px",
+            "paddingLeft": "0px",
+            "paddingRight": "0px",
           }
         }
       >
@@ -304,11 +301,6 @@ exports[`Dashboard renders in flyout 1`] = `
             onSeverityChange={[Function]}
             onStateChange={[Function]}
             pageCount={1}
-            panelStyles={
-              Object {
-                "padding": "8px 0px 16px",
-              }
-            }
             search=""
             severity="ALL"
             state="ALL"
@@ -317,7 +309,7 @@ exports[`Dashboard renders in flyout 1`] = `
               gutterSize="s"
               style={
                 Object {
-                  "padding": "8px 0px 16px",
+                  "padding": "0px 5px",
                 }
               }
             >
@@ -325,7 +317,7 @@ exports[`Dashboard renders in flyout 1`] = `
                 className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
                 style={
                   Object {
-                    "padding": "8px 0px 16px",
+                    "padding": "0px 5px",
                   }
                 }
               >
@@ -577,9 +569,216 @@ exports[`Dashboard renders in flyout 1`] = `
                     </EuiCompressedSelect>
                   </div>
                 </EuiFlexItem>
+                <EuiFlexItem
+                  grow={false}
+                  style={
+                    Object {
+                      "justifyContent": "center",
+                    }
+                  }
+                >
+                  <div
+                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                    style={
+                      Object {
+                        "justifyContent": "center",
+                      }
+                    }
+                  >
+                    <EuiPagination
+                      activePage={0}
+                      onPageClick={[Function]}
+                      pageCount={1}
+                    >
+                      <nav
+                        className="euiPagination"
+                      >
+                        <EuiI18n
+                          default="Previous page, {page}"
+                          token="euiPagination.previousPage"
+                          values={
+                            Object {
+                              "page": 0,
+                            }
+                          }
+                        >
+                          <EuiI18n
+                            default="Previous page"
+                            token="euiPagination.disabledPreviousPage"
+                          >
+                            <EuiButtonIcon
+                              aria-label="Previous page"
+                              color="text"
+                              data-test-subj="pagination-button-previous"
+                              disabled={true}
+                              iconType="arrowLeft"
+                              onClick={[Function]}
+                            >
+                              <button
+                                aria-label="Previous page"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
+                                data-test-subj="pagination-button-previous"
+                                disabled={true}
+                                onClick={[Function]}
+                                type="button"
+                              >
+                                <EuiIcon
+                                  aria-hidden="true"
+                                  className="euiButtonIcon__icon"
+                                  color="inherit"
+                                  size="m"
+                                  type="arrowLeft"
+                                >
+                                  <div>
+                                    EuiIconMock
+                                  </div>
+                                </EuiIcon>
+                              </button>
+                            </EuiButtonIcon>
+                          </EuiI18n>
+                        </EuiI18n>
+                        <ul
+                          className="euiPagination__list"
+                        >
+                          <PaginationButton
+                            key="0"
+                            pageIndex={0}
+                          >
+                            <li
+                              className="euiPagination__item"
+                            >
+                              <EuiPaginationButton
+                                hideOnMobile={true}
+                                isActive={true}
+                                onClick={[Function]}
+                                pageIndex={0}
+                                totalPages={1}
+                              >
+                                <EuiI18n
+                                  default="Page {page} of {totalPages}"
+                                  token="euiPaginationButton.longPageString"
+                                  values={
+                                    Object {
+                                      "page": 1,
+                                      "totalPages": 1,
+                                    }
+                                  }
+                                >
+                                  <EuiI18n
+                                    default="Page {page}"
+                                    token="euiPaginationButton.shortPageString"
+                                    values={
+                                      Object {
+                                        "page": 1,
+                                      }
+                                    }
+                                  >
+                                    <EuiButtonEmpty
+                                      aria-current={true}
+                                      aria-label="Page 1 of 1"
+                                      className="euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                      color="text"
+                                      data-test-subj="pagination-button-0"
+                                      isDisabled={true}
+                                      onClick={[Function]}
+                                      size="s"
+                                    >
+                                      <button
+                                        aria-current={true}
+                                        aria-label="Page 1 of 1"
+                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                        data-test-subj="pagination-button-0"
+                                        disabled={true}
+                                        onClick={[Function]}
+                                        type="button"
+                                      >
+                                        <EuiButtonContent
+                                          className="euiButtonEmpty__content"
+                                          iconGap="m"
+                                          iconSide="left"
+                                          iconSize="m"
+                                          textProps={
+                                            Object {
+                                              "className": "euiButtonEmpty__text",
+                                            }
+                                          }
+                                        >
+                                          <span
+                                            className="euiButtonContent euiButtonEmpty__content"
+                                          >
+                                            <span
+                                              className="euiButtonEmpty__text"
+                                            >
+                                              1
+                                            </span>
+                                          </span>
+                                        </EuiButtonContent>
+                                      </button>
+                                    </EuiButtonEmpty>
+                                  </EuiI18n>
+                                </EuiI18n>
+                              </EuiPaginationButton>
+                            </li>
+                          </PaginationButton>
+                        </ul>
+                        <EuiI18n
+                          default="Next page, {page}"
+                          token="euiPagination.nextPage"
+                          values={
+                            Object {
+                              "page": 2,
+                            }
+                          }
+                        >
+                          <EuiI18n
+                            default="Next page"
+                            token="euiPagination.disabledNextPage"
+                          >
+                            <EuiButtonIcon
+                              aria-label="Next page"
+                              color="text"
+                              data-test-subj="pagination-button-next"
+                              disabled={true}
+                              iconType="arrowRight"
+                              onClick={[Function]}
+                            >
+                              <button
+                                aria-label="Next page"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
+                                data-test-subj="pagination-button-next"
+                                disabled={true}
+                                onClick={[Function]}
+                                type="button"
+                              >
+                                <EuiIcon
+                                  aria-hidden="true"
+                                  className="euiButtonIcon__icon"
+                                  color="inherit"
+                                  size="m"
+                                  type="arrowRight"
+                                >
+                                  <div>
+                                    EuiIconMock
+                                  </div>
+                                </EuiIcon>
+                              </button>
+                            </EuiButtonIcon>
+                          </EuiI18n>
+                        </EuiI18n>
+                      </nav>
+                    </EuiPagination>
+                  </div>
+                </EuiFlexItem>
               </div>
             </EuiFlexGroup>
           </DashboardControls>
+          <EuiHorizontalRule
+            margin="xs"
+          >
+            <hr
+              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginXSmall"
+            />
+          </EuiHorizontalRule>
           <EuiBasicTable
             columns={
               Array [
@@ -1522,18 +1721,14 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
         "hideTitleBorder": undefined,
       }
     }
-    panelStyles={
-      Object {
-        "padding": "16px",
-      }
-    }
     title="Alerts by triggers"
     titleSize="s"
   >
     <EuiPanel
       style={
         Object {
-          "padding": "16px",
+          "paddingLeft": "0px",
+          "paddingRight": "0px",
         }
       }
     >
@@ -1541,7 +1736,8 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
         className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
         style={
           Object {
-            "padding": "16px",
+            "paddingLeft": "0px",
+            "paddingRight": "0px",
           }
         }
       >
@@ -1774,11 +1970,6 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
             onSeverityChange={[Function]}
             onStateChange={[Function]}
             pageCount={1}
-            panelStyles={
-              Object {
-                "padding": "0px 0px 16px",
-              }
-            }
             search=""
             severity="ALL"
             state="ALL"
@@ -1787,7 +1978,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
               gutterSize="s"
               style={
                 Object {
-                  "padding": "0px 0px 16px",
+                  "padding": "0px 5px",
                 }
               }
             >
@@ -1795,7 +1986,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                 className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
                 style={
                   Object {
-                    "padding": "0px 0px 16px",
+                    "padding": "0px 5px",
                   }
                 }
               >
@@ -2221,9 +2412,216 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                     </EuiCompressedSelect>
                   </div>
                 </EuiFlexItem>
+                <EuiFlexItem
+                  grow={false}
+                  style={
+                    Object {
+                      "justifyContent": "center",
+                    }
+                  }
+                >
+                  <div
+                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                    style={
+                      Object {
+                        "justifyContent": "center",
+                      }
+                    }
+                  >
+                    <EuiPagination
+                      activePage={0}
+                      onPageClick={[Function]}
+                      pageCount={1}
+                    >
+                      <nav
+                        className="euiPagination"
+                      >
+                        <EuiI18n
+                          default="Previous page, {page}"
+                          token="euiPagination.previousPage"
+                          values={
+                            Object {
+                              "page": 0,
+                            }
+                          }
+                        >
+                          <EuiI18n
+                            default="Previous page"
+                            token="euiPagination.disabledPreviousPage"
+                          >
+                            <EuiButtonIcon
+                              aria-label="Previous page"
+                              color="text"
+                              data-test-subj="pagination-button-previous"
+                              disabled={true}
+                              iconType="arrowLeft"
+                              onClick={[Function]}
+                            >
+                              <button
+                                aria-label="Previous page"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
+                                data-test-subj="pagination-button-previous"
+                                disabled={true}
+                                onClick={[Function]}
+                                type="button"
+                              >
+                                <EuiIcon
+                                  aria-hidden="true"
+                                  className="euiButtonIcon__icon"
+                                  color="inherit"
+                                  size="m"
+                                  type="arrowLeft"
+                                >
+                                  <div>
+                                    EuiIconMock
+                                  </div>
+                                </EuiIcon>
+                              </button>
+                            </EuiButtonIcon>
+                          </EuiI18n>
+                        </EuiI18n>
+                        <ul
+                          className="euiPagination__list"
+                        >
+                          <PaginationButton
+                            key="0"
+                            pageIndex={0}
+                          >
+                            <li
+                              className="euiPagination__item"
+                            >
+                              <EuiPaginationButton
+                                hideOnMobile={true}
+                                isActive={true}
+                                onClick={[Function]}
+                                pageIndex={0}
+                                totalPages={1}
+                              >
+                                <EuiI18n
+                                  default="Page {page} of {totalPages}"
+                                  token="euiPaginationButton.longPageString"
+                                  values={
+                                    Object {
+                                      "page": 1,
+                                      "totalPages": 1,
+                                    }
+                                  }
+                                >
+                                  <EuiI18n
+                                    default="Page {page}"
+                                    token="euiPaginationButton.shortPageString"
+                                    values={
+                                      Object {
+                                        "page": 1,
+                                      }
+                                    }
+                                  >
+                                    <EuiButtonEmpty
+                                      aria-current={true}
+                                      aria-label="Page 1 of 1"
+                                      className="euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                      color="text"
+                                      data-test-subj="pagination-button-0"
+                                      isDisabled={true}
+                                      onClick={[Function]}
+                                      size="s"
+                                    >
+                                      <button
+                                        aria-current={true}
+                                        aria-label="Page 1 of 1"
+                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                        data-test-subj="pagination-button-0"
+                                        disabled={true}
+                                        onClick={[Function]}
+                                        type="button"
+                                      >
+                                        <EuiButtonContent
+                                          className="euiButtonEmpty__content"
+                                          iconGap="m"
+                                          iconSide="left"
+                                          iconSize="m"
+                                          textProps={
+                                            Object {
+                                              "className": "euiButtonEmpty__text",
+                                            }
+                                          }
+                                        >
+                                          <span
+                                            className="euiButtonContent euiButtonEmpty__content"
+                                          >
+                                            <span
+                                              className="euiButtonEmpty__text"
+                                            >
+                                              1
+                                            </span>
+                                          </span>
+                                        </EuiButtonContent>
+                                      </button>
+                                    </EuiButtonEmpty>
+                                  </EuiI18n>
+                                </EuiI18n>
+                              </EuiPaginationButton>
+                            </li>
+                          </PaginationButton>
+                        </ul>
+                        <EuiI18n
+                          default="Next page, {page}"
+                          token="euiPagination.nextPage"
+                          values={
+                            Object {
+                              "page": 2,
+                            }
+                          }
+                        >
+                          <EuiI18n
+                            default="Next page"
+                            token="euiPagination.disabledNextPage"
+                          >
+                            <EuiButtonIcon
+                              aria-label="Next page"
+                              color="text"
+                              data-test-subj="pagination-button-next"
+                              disabled={true}
+                              iconType="arrowRight"
+                              onClick={[Function]}
+                            >
+                              <button
+                                aria-label="Next page"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
+                                data-test-subj="pagination-button-next"
+                                disabled={true}
+                                onClick={[Function]}
+                                type="button"
+                              >
+                                <EuiIcon
+                                  aria-hidden="true"
+                                  className="euiButtonIcon__icon"
+                                  color="inherit"
+                                  size="m"
+                                  type="arrowRight"
+                                >
+                                  <div>
+                                    EuiIconMock
+                                  </div>
+                                </EuiIcon>
+                              </button>
+                            </EuiButtonIcon>
+                          </EuiI18n>
+                        </EuiI18n>
+                      </nav>
+                    </EuiPagination>
+                  </div>
+                </EuiFlexItem>
               </div>
             </EuiFlexGroup>
           </DashboardControls>
+          <EuiHorizontalRule
+            margin="xs"
+          >
+            <hr
+              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginXSmall"
+            />
+          </EuiHorizontalRule>
           <EuiBasicTable
             columns={
               Array [
@@ -3379,18 +3777,14 @@ exports[`Dashboard renders with per alert view 1`] = `
         "hideTitleBorder": false,
       }
     }
-    panelStyles={
-      Object {
-        "padding": "16px",
-      }
-    }
     title="Alerts"
     titleSize="s"
   >
     <EuiPanel
       style={
         Object {
-          "padding": "16px",
+          "paddingLeft": "0px",
+          "paddingRight": "0px",
         }
       }
     >
@@ -3398,7 +3792,8 @@ exports[`Dashboard renders with per alert view 1`] = `
         className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
         style={
           Object {
-            "padding": "16px",
+            "paddingLeft": "0px",
+            "paddingRight": "0px",
           }
         }
       >
@@ -3570,11 +3965,6 @@ exports[`Dashboard renders with per alert view 1`] = `
             onSeverityChange={[Function]}
             onStateChange={[Function]}
             pageCount={1}
-            panelStyles={
-              Object {
-                "padding": "8px 0px 16px",
-              }
-            }
             search=""
             severity="ALL"
             state="ALL"
@@ -3583,7 +3973,7 @@ exports[`Dashboard renders with per alert view 1`] = `
               gutterSize="s"
               style={
                 Object {
-                  "padding": "8px 0px 16px",
+                  "padding": "0px 5px",
                 }
               }
             >
@@ -3591,7 +3981,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                 className="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive"
                 style={
                   Object {
-                    "padding": "8px 0px 16px",
+                    "padding": "0px 5px",
                   }
                 }
               >
@@ -4017,9 +4407,216 @@ exports[`Dashboard renders with per alert view 1`] = `
                     </EuiCompressedSelect>
                   </div>
                 </EuiFlexItem>
+                <EuiFlexItem
+                  grow={false}
+                  style={
+                    Object {
+                      "justifyContent": "center",
+                    }
+                  }
+                >
+                  <div
+                    className="euiFlexItem euiFlexItem--flexGrowZero"
+                    style={
+                      Object {
+                        "justifyContent": "center",
+                      }
+                    }
+                  >
+                    <EuiPagination
+                      activePage={0}
+                      onPageClick={[Function]}
+                      pageCount={1}
+                    >
+                      <nav
+                        className="euiPagination"
+                      >
+                        <EuiI18n
+                          default="Previous page, {page}"
+                          token="euiPagination.previousPage"
+                          values={
+                            Object {
+                              "page": 0,
+                            }
+                          }
+                        >
+                          <EuiI18n
+                            default="Previous page"
+                            token="euiPagination.disabledPreviousPage"
+                          >
+                            <EuiButtonIcon
+                              aria-label="Previous page"
+                              color="text"
+                              data-test-subj="pagination-button-previous"
+                              disabled={true}
+                              iconType="arrowLeft"
+                              onClick={[Function]}
+                            >
+                              <button
+                                aria-label="Previous page"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
+                                data-test-subj="pagination-button-previous"
+                                disabled={true}
+                                onClick={[Function]}
+                                type="button"
+                              >
+                                <EuiIcon
+                                  aria-hidden="true"
+                                  className="euiButtonIcon__icon"
+                                  color="inherit"
+                                  size="m"
+                                  type="arrowLeft"
+                                >
+                                  <div>
+                                    EuiIconMock
+                                  </div>
+                                </EuiIcon>
+                              </button>
+                            </EuiButtonIcon>
+                          </EuiI18n>
+                        </EuiI18n>
+                        <ul
+                          className="euiPagination__list"
+                        >
+                          <PaginationButton
+                            key="0"
+                            pageIndex={0}
+                          >
+                            <li
+                              className="euiPagination__item"
+                            >
+                              <EuiPaginationButton
+                                hideOnMobile={true}
+                                isActive={true}
+                                onClick={[Function]}
+                                pageIndex={0}
+                                totalPages={1}
+                              >
+                                <EuiI18n
+                                  default="Page {page} of {totalPages}"
+                                  token="euiPaginationButton.longPageString"
+                                  values={
+                                    Object {
+                                      "page": 1,
+                                      "totalPages": 1,
+                                    }
+                                  }
+                                >
+                                  <EuiI18n
+                                    default="Page {page}"
+                                    token="euiPaginationButton.shortPageString"
+                                    values={
+                                      Object {
+                                        "page": 1,
+                                      }
+                                    }
+                                  >
+                                    <EuiButtonEmpty
+                                      aria-current={true}
+                                      aria-label="Page 1 of 1"
+                                      className="euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                      color="text"
+                                      data-test-subj="pagination-button-0"
+                                      isDisabled={true}
+                                      onClick={[Function]}
+                                      size="s"
+                                    >
+                                      <button
+                                        aria-current={true}
+                                        aria-label="Page 1 of 1"
+                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                        data-test-subj="pagination-button-0"
+                                        disabled={true}
+                                        onClick={[Function]}
+                                        type="button"
+                                      >
+                                        <EuiButtonContent
+                                          className="euiButtonEmpty__content"
+                                          iconGap="m"
+                                          iconSide="left"
+                                          iconSize="m"
+                                          textProps={
+                                            Object {
+                                              "className": "euiButtonEmpty__text",
+                                            }
+                                          }
+                                        >
+                                          <span
+                                            className="euiButtonContent euiButtonEmpty__content"
+                                          >
+                                            <span
+                                              className="euiButtonEmpty__text"
+                                            >
+                                              1
+                                            </span>
+                                          </span>
+                                        </EuiButtonContent>
+                                      </button>
+                                    </EuiButtonEmpty>
+                                  </EuiI18n>
+                                </EuiI18n>
+                              </EuiPaginationButton>
+                            </li>
+                          </PaginationButton>
+                        </ul>
+                        <EuiI18n
+                          default="Next page, {page}"
+                          token="euiPagination.nextPage"
+                          values={
+                            Object {
+                              "page": 2,
+                            }
+                          }
+                        >
+                          <EuiI18n
+                            default="Next page"
+                            token="euiPagination.disabledNextPage"
+                          >
+                            <EuiButtonIcon
+                              aria-label="Next page"
+                              color="text"
+                              data-test-subj="pagination-button-next"
+                              disabled={true}
+                              iconType="arrowRight"
+                              onClick={[Function]}
+                            >
+                              <button
+                                aria-label="Next page"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
+                                data-test-subj="pagination-button-next"
+                                disabled={true}
+                                onClick={[Function]}
+                                type="button"
+                              >
+                                <EuiIcon
+                                  aria-hidden="true"
+                                  className="euiButtonIcon__icon"
+                                  color="inherit"
+                                  size="m"
+                                  type="arrowRight"
+                                >
+                                  <div>
+                                    EuiIconMock
+                                  </div>
+                                </EuiIcon>
+                              </button>
+                            </EuiButtonIcon>
+                          </EuiI18n>
+                        </EuiI18n>
+                      </nav>
+                    </EuiPagination>
+                  </div>
+                </EuiFlexItem>
               </div>
             </EuiFlexGroup>
           </DashboardControls>
+          <EuiHorizontalRule
+            margin="xs"
+          >
+            <hr
+              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginXSmall"
+            />
+          </EuiHorizontalRule>
           <EuiBasicTable
             columns={
               Array [
diff --git a/public/pages/Home/Home.js b/public/pages/Home/Home.js
index 9174e1556..33713c500 100644
--- a/public/pages/Home/Home.js
+++ b/public/pages/Home/Home.js
@@ -82,11 +82,11 @@ export default class Home extends Component {
     return (
       <div>
         {!defaultRoute && (
-          <EuiTabs size="s" style={{ padding: '16px 16px 0px' }}>
+          <EuiTabs size="s">
             {this.tabs.map(this.renderTab)}
           </EuiTabs>
         )}
-        <div style={{ padding: '16px' }}>
+        <div style={{ padding: '25px 25px' }}>
           <Switch>
             <Route
               exact
diff --git a/public/pages/Home/__snapshots__/Home.test.js.snap b/public/pages/Home/__snapshots__/Home.test.js.snap
index d5df1e6de..82f586fb8 100644
--- a/public/pages/Home/__snapshots__/Home.test.js.snap
+++ b/public/pages/Home/__snapshots__/Home.test.js.snap
@@ -5,7 +5,6 @@ exports[`Home renders 1`] = `
   <div
     class="euiTabs euiTabs--small"
     role="tablist"
-    style="padding:16px 16px 0px"
   >
     <button
       aria-selected="true"
@@ -45,7 +44,7 @@ exports[`Home renders 1`] = `
     </button>
   </div>
   <div
-    style="padding:16px"
+    style="padding:25px 25px"
   />
 </div>
 `;
diff --git a/public/pages/Main/Main.js b/public/pages/Main/Main.js
index ca67c308e..8813eda35 100644
--- a/public/pages/Main/Main.js
+++ b/public/pages/Main/Main.js
@@ -146,7 +146,7 @@ class Main extends Component {
                   <MultiDataSourceContext.Provider
                     value={{ dataSourceId: this.state.selectedDataSourceId }}
                   >
-                    <div>
+                    <div style={{ padding: '15px 0px' }}>
                       <Flyout
                         flyout={flyout}
                         onClose={() => {
diff --git a/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap b/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap
index 5eb075a99..94bcb3dc6 100644
--- a/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap
+++ b/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap
@@ -3,7 +3,7 @@
 exports[`MonitorOverview renders 1`] = `
 <div
   class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
-  style="padding:16px"
+  style="padding-left:0px;padding-right:0px"
 >
   <div
     class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--directionRow euiFlexGroup--responsive"
diff --git a/public/pages/MonitorDetails/containers/MonitorDetails.js b/public/pages/MonitorDetails/containers/MonitorDetails.js
index d4aa13c10..57e51a5fe 100644
--- a/public/pages/MonitorDetails/containers/MonitorDetails.js
+++ b/public/pages/MonitorDetails/containers/MonitorDetails.js
@@ -26,8 +26,8 @@ import {
   EuiTab,
   EuiTabs,
   EuiText,
-  EuiToolTip,
-  EuiIcon,
+  EuiButtonIcon,
+  EuiButton,
 } from '@elastic/eui';
 import CreateMonitor from '../../CreateMonitor';
 import MonitorOverview from '../components/MonitorOverview';
@@ -76,7 +76,7 @@ export default class MonitorDetails extends Component {
         const monitorType = this.state.monitor.monitor_type;
         this.props.history.push({
           ...this.props.location,
-          search: `?action=${MONITOR_ACTIONS.EDIT_MONITOR}&monitorType=${monitorType}${
+          search: `?action=${MONITOR_ACTIONS.UPDATE_MONITOR}&monitorType=${monitorType}${
             dataSourceId !== undefined ? `&dataSourceId=${dataSourceId}` : ''
           }`,
         });
@@ -444,7 +444,7 @@ export default class MonitorDetails extends Component {
       setFlyout,
     } = this.props;
     const { action } = queryString.parse(location.search);
-    const updatingMonitor = action === MONITOR_ACTIONS.EDIT_MONITOR;
+    const updatingMonitor = action === MONITOR_ACTIONS.UPDATE_MONITOR;
     const detectorId = _.get(monitor, MONITOR_INPUT_DETECTOR_ID, undefined);
 
     if (loading) {
@@ -492,15 +492,12 @@ export default class MonitorDetails extends Component {
 
     if (useUpdatedUx) {
       monitorActions.unshift(
-        <EuiToolTip content="Delete">
-          <EuiSmallButton
-            onClick={this.onDeleteClick}
-            color="danger"
-            aria-label="Delete"
-          >
-            <EuiIcon type="trash" />
-          </EuiSmallButton>
-        </EuiToolTip>
+        <EuiSmallButton
+          iconType={'trash'}
+          onClick={this.onDeleteClick}
+          color="danger"
+          aria-label="Delete"
+        ></EuiSmallButton>
       );
       monitorActions.push(
         <EuiSmallButton onClick={editMonitor} fill>
@@ -521,7 +518,7 @@ export default class MonitorDetails extends Component {
     }
 
     return (
-      <div style={{ padding: '16px' }}>
+      <div style={{ padding: '25px 50px' }}>
         {this.renderNoTriggersCallOut()}
         <PageHeader
           appBadgeControls={[{ renderComponent: badgeControl }]}
@@ -545,7 +542,7 @@ export default class MonitorDetails extends Component {
             ))}
           </EuiFlexGroup>
         </PageHeader>
-        {!useUpdatedUx && <EuiSpacer />}
+        <EuiSpacer />
         <MonitorOverview
           monitor={monitor}
           monitorId={monitorId}
diff --git a/public/pages/Monitors/components/MonitorActions/MonitorActions.js b/public/pages/Monitors/components/MonitorActions/MonitorActions.js
index 6c10d669d..11d41090f 100644
--- a/public/pages/Monitors/components/MonitorActions/MonitorActions.js
+++ b/public/pages/Monitors/components/MonitorActions/MonitorActions.js
@@ -36,17 +36,6 @@ export default class MonitorActions extends Component {
       >
         Acknowledge
       </EuiContextMenuItem>,
-      <EuiContextMenuItem
-        key="edit"
-        data-test-subj="editItem"
-        onClick={() => {
-          this.onCloseActions();
-          this.props.onClickEdit();
-        }}
-        disabled={isEditDisabled}
-      >
-        Edit
-      </EuiContextMenuItem>,
       <EuiContextMenuItem
         key="enable"
         data-test-subj="enableItem"
@@ -95,13 +84,7 @@ export default class MonitorActions extends Component {
     const { isActionsOpen } = this.state;
     const { isEditDisabled, onClickEdit } = this.props;
     const createMonitorControl = (
-      <EuiSmallButton
-        fill href={`#${APP_PATH.CREATE_MONITOR}`}
-        data-test-subj="createButton"
-        iconType="plus"
-        iconSide="left"
-        iconGap="s"
-      >
+      <EuiSmallButton fill href={`#${APP_PATH.CREATE_MONITOR}`} data-test-subj="createButton">
         Create monitor
       </EuiSmallButton>
     );
@@ -129,6 +112,15 @@ export default class MonitorActions extends Component {
             <EuiContextMenuPanel items={this.getActions()} size="s" />
           </EuiPopover>
         </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiSmallButton
+            disabled={isEditDisabled}
+            onClick={onClickEdit}
+            data-test-subj="editButton"
+          >
+            Edit
+          </EuiSmallButton>
+        </EuiFlexItem>
         <PageHeader
           appRightControls={[
             {
diff --git a/public/pages/Monitors/components/MonitorActions/MonitorActions.test.js b/public/pages/Monitors/components/MonitorActions/MonitorActions.test.js
index d4ccaedc3..f96948b1e 100644
--- a/public/pages/Monitors/components/MonitorActions/MonitorActions.test.js
+++ b/public/pages/Monitors/components/MonitorActions/MonitorActions.test.js
@@ -107,16 +107,14 @@ describe('MonitorActions', () => {
   });
 
   test('does not call onClickEdit when Edit is clicked and edit is disabled', () => {
-    wrapper.find('[data-test-subj="actionsButton"]').hostNodes().simulate('click');
-    wrapper.find('[data-test-subj="editItem"]').hostNodes().simulate('click');
+    wrapper.find('[data-test-subj="editButton"]').hostNodes().simulate('click');
     expect(props.onClickEdit).toHaveBeenCalledTimes(0);
   });
 
   test('calls onClickEdit when Edit is clicked and isEditDisabled=false', () => {
     const props = getProps();
     wrapper.setProps({ ...props, isEditDisabled: false });
-    wrapper.find('[data-test-subj="actionsButton"]').hostNodes().simulate('click');
-    wrapper.find('[data-test-subj="editItem"]').hostNodes().simulate('click');
+    wrapper.find('[data-test-subj="editButton"]').hostNodes().simulate('click');
     expect(props.onClickEdit).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/public/pages/Monitors/components/MonitorActions/__snapshots__/MonitorActions.test.js.snap b/public/pages/Monitors/components/MonitorActions/__snapshots__/MonitorActions.test.js.snap
index 27f98b44e..28675fe19 100644
--- a/public/pages/Monitors/components/MonitorActions/__snapshots__/MonitorActions.test.js.snap
+++ b/public/pages/Monitors/components/MonitorActions/__snapshots__/MonitorActions.test.js.snap
@@ -35,6 +35,26 @@ exports[`MonitorActions renders 1`] = `
       </div>
     </div>
   </div>
+  <div
+    class="euiFlexItem euiFlexItem--flexGrowZero"
+  >
+    <button
+      class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
+      data-test-subj="editButton"
+      disabled=""
+      type="button"
+    >
+      <span
+        class="euiButtonContent euiButton__content"
+      >
+        <span
+          class="euiButton__text"
+        >
+          Edit
+        </span>
+      </span>
+    </button>
+  </div>
   <div
     class="euiFlexItem euiFlexItem--flexGrowZero"
   >
@@ -45,11 +65,8 @@ exports[`MonitorActions renders 1`] = `
       rel="noreferrer"
     >
       <span
-        class="euiButtonContent euiButtonContent--smallIconGap euiButton__content"
+        class="euiButtonContent euiButton__content"
       >
-        <div>
-          EuiIconMock
-        </div>
         <span
           class="euiButton__text"
         >
diff --git a/public/pages/Monitors/components/MonitorControls/MonitorControls.js b/public/pages/Monitors/components/MonitorControls/MonitorControls.js
index 593fb92a1..56c329855 100644
--- a/public/pages/Monitors/components/MonitorControls/MonitorControls.js
+++ b/public/pages/Monitors/components/MonitorControls/MonitorControls.js
@@ -34,7 +34,7 @@ const MonitorControls = ({
   onPageClick,
   monitorActions = null,
 }) => (
-  <EuiFlexGroup style={{ padding: '0px 0px 16px' }} gutterSize="s">
+  <EuiFlexGroup style={{ padding: '0px 5px' }} gutterSize="s">
     <EuiFlexItem>
       <EuiCompressedFieldSearch
         fullWidth={true}
@@ -47,6 +47,9 @@ const MonitorControls = ({
       <EuiCompressedSelect options={states} value={state} onChange={onStateChange} />
     </EuiFlexItem>
     {monitorActions && <EuiFlexItem grow={false}>{monitorActions}</EuiFlexItem>}
+    <EuiFlexItem grow={false} style={{ justifyContent: 'center' }}>
+      <EuiPagination pageCount={pageCount} activePage={activePage} onPageClick={onPageClick} />
+    </EuiFlexItem>
   </EuiFlexGroup>
 );
 
diff --git a/public/pages/Monitors/containers/Monitors/Monitors.js b/public/pages/Monitors/containers/Monitors/Monitors.js
index cb822a7ec..22be5d5f4 100644
--- a/public/pages/Monitors/containers/Monitors/Monitors.js
+++ b/public/pages/Monitors/containers/Monitors/Monitors.js
@@ -6,7 +6,7 @@
 import React, { Component } from 'react';
 import _ from 'lodash';
 import queryString from 'query-string';
-import { EuiBasicTable } from '@elastic/eui';
+import { EuiBasicTable, EuiHorizontalRule } from '@elastic/eui';
 import AcknowledgeModal from '../../components/AcknowledgeModal';
 import ContentPanel from '../../../../components/ContentPanel';
 import MonitorActions from '../../components/MonitorActions';
@@ -285,7 +285,7 @@ export default class Monitors extends Component {
     const {
       selectedItems: [{ id }],
     } = this.state;
-    if (id) this.props.history.push(`/monitors/${id}?action=${MONITOR_ACTIONS.EDIT_MONITOR}`);
+    if (id) this.props.history.push(`/monitors/${id}?action=${MONITOR_ACTIONS.UPDATE_MONITOR}`);
   }
 
   onClickEnable(item) {
@@ -467,7 +467,6 @@ export default class Monitors extends Component {
           bodyStyles={{ padding: 'initial' }}
           title={useUpdatedUx ? undefined : 'Monitors'}
           panelOptions={{ hideTitleBorder: useUpdatedUx }}
-          panelStyles={{ padding: useUpdatedUx && totalMonitors < 1 ? '16px 16px 0px' : '16px' }}
         >
           <MonitorControls
             activePage={page}
@@ -480,6 +479,8 @@ export default class Monitors extends Component {
             monitorActions={useUpdatedUx ? monitorActions : null}
           />
 
+          <EuiHorizontalRule margin="xs" />
+
           {showAcknowledgeModal && (
             <AcknowledgeModal
               alerts={alerts}
diff --git a/public/pages/Monitors/containers/Monitors/Monitors.test.js b/public/pages/Monitors/containers/Monitors/Monitors.test.js
index f68b5e111..8e195f85b 100644
--- a/public/pages/Monitors/containers/Monitors/Monitors.test.js
+++ b/public/pages/Monitors/containers/Monitors/Monitors.test.js
@@ -218,7 +218,7 @@ describe('Monitors', () => {
 
     expect(onClickEdit).toHaveBeenCalled();
     expect(historyMock.push).toHaveBeenCalled();
-    expect(historyMock.push).toHaveBeenCalledWith(`/monitors/random_id?action=edit-monitor`);
+    expect(historyMock.push).toHaveBeenCalledWith(`/monitors/random_id?action=update-monitor`);
   });
 
   test('onClickEnable calls updateMonitors with monitor and enable:true update', () => {
diff --git a/public/pages/Monitors/containers/Monitors/__snapshots__/Monitors.test.js.snap b/public/pages/Monitors/containers/Monitors/__snapshots__/Monitors.test.js.snap
index 8c0f71f42..28233c7c4 100644
--- a/public/pages/Monitors/containers/Monitors/__snapshots__/Monitors.test.js.snap
+++ b/public/pages/Monitors/containers/Monitors/__snapshots__/Monitors.test.js.snap
@@ -24,11 +24,6 @@ exports[`Monitors renders 1`] = `
         "hideTitleBorder": undefined,
       }
     }
-    panelStyles={
-      Object {
-        "padding": "16px",
-      }
-    }
     title="Monitors"
   >
     <MonitorControls
@@ -41,6 +36,9 @@ exports[`Monitors renders 1`] = `
       search=""
       state="all"
     />
+    <EuiHorizontalRule
+      margin="xs"
+    />
     <EuiBasicTable
       columns={
         Array [
diff --git a/public/utils/constants.js b/public/utils/constants.js
index 708b8593a..3b916785d 100644
--- a/public/utils/constants.js
+++ b/public/utils/constants.js
@@ -40,7 +40,7 @@ export const DESTINATION_ACTIONS = {
 };
 
 export const MONITOR_ACTIONS = {
-  EDIT_MONITOR: 'edit-monitor',
+  UPDATE_MONITOR: 'update-monitor',
 };
 
 export const TRIGGER_ACTIONS = {
diff --git a/public/utils/helpers.js b/public/utils/helpers.js
index e8df666fa..f95f3b6fc 100644
--- a/public/utils/helpers.js
+++ b/public/utils/helpers.js
@@ -160,9 +160,7 @@ export function initManageChannelsUrl(httpClient) {
     const relativePath = `/app/${
       getUseUpdatedUx() ? 'channels' : 'notifications-dashboards'
     }#/channels`;
-    MANAGE_CHANNELS_URL = httpClient.basePath.prepend(relativePath, {
-      withoutClientBasePath: true,
-    });
+    MANAGE_CHANNELS_URL = httpClient.basePath.prepend(relativePath);
   }
 }