diff --git a/cypress.json b/cypress.json
index f67f39bda2..21eaf39127 100644
--- a/cypress.json
+++ b/cypress.json
@@ -12,5 +12,7 @@
     "www.google-analytics.com",
     "www.googletagmanager.com",
     "www.honeybadger.io"
-  ]
+  ],
+  "viewportWidth": 1200,
+  "viewportHeight": 1000
 }
diff --git a/cypress/e2e/oss/onboarding.test.ts b/cypress/e2e/oss/onboarding.test.ts
index 3286cb6c99..a1c46290af 100644
--- a/cypress/e2e/oss/onboarding.test.ts
+++ b/cypress/e2e/oss/onboarding.test.ts
@@ -73,16 +73,12 @@ describe('Onboarding', () => {
 
     cy.getByTestID('next').should('be.disabled')
 
-    cy.getByTestID('next')
-      .children('.cf-button--label')
-      .contains('Continue')
+    cy.getByTestID('next').contains('CONTINUE', {matchCase: false})
 
     // Input fields
     cy.fillInOSSLoginFormWithDefaults()
 
-    cy.getByTestID('next')
-      .children('.cf-button--label')
-      .contains('Continue')
+    cy.getByTestID('next').contains('CONTINUE', {matchCase: false})
 
     cy.getByTestID('next')
       .should('be.enabled')
@@ -184,8 +180,7 @@ describe('Onboarding', () => {
 
     cy.getByTestID('next')
       .should('be.disabled')
-      .children('.cf-button--label')
-      .contains('Continue')
+      .contains('CONTINUE', {matchCase: false})
 
     cy.get<string>('@defaultPassword').then((defaultPassword: string) => {
       cy.getByTestID('input-field--password').type(defaultPassword)
@@ -193,8 +188,7 @@ describe('Onboarding', () => {
 
     cy.getByTestID('next')
       .should('be.disabled')
-      .children('.cf-button--label')
-      .contains('Continue')
+      .contains('CONTINUE', {matchCase: false})
 
     cy.getByTestID('input-field--password-chk').type('drowssap')
 
@@ -217,8 +211,7 @@ describe('Onboarding', () => {
 
     cy.getByTestID('next')
       .should('be.disabled')
-      .children('.cf-button--label')
-      .contains('Continue')
+      .contains('CONTINUE', {matchCase: false})
 
     cy.get<string>('@defaultOrg').then((defaultOrg: string) => {
       cy.getByTestID('input-field--orgname').type(defaultOrg)
@@ -228,8 +221,7 @@ describe('Onboarding', () => {
 
       cy.getByTestID('next')
         .should('be.disabled')
-        .children('.cf-button--label')
-        .contains('Continue')
+        .contains('CONTINUE', {matchCase: false})
 
       cy.get<string>('@defaultPassword').then((defaultPassword: string) => {
         cy.getByTestID('input-field--password')
@@ -244,16 +236,14 @@ describe('Onboarding', () => {
 
       cy.getByTestID('next')
         .should('be.enabled')
-        .children('.cf-button--label')
-        .contains('Continue')
+        .contains('CONTINUE', {matchCase: false})
 
       // check cleared username
       cy.getByTestID('input-field--username').clear()
 
       cy.getByTestID('next')
         .should('be.disabled')
-        .children('.cf-button--label')
-        .contains('Continue')
+        .contains('CONTINUE', {matchCase: false})
 
       cy.get<string>('@defaultUser').then((defaultUser: string) => {
         cy.getByTestID('input-field--username').type(defaultUser)
@@ -261,8 +251,7 @@ describe('Onboarding', () => {
 
       cy.getByTestID('next')
         .should('be.enabled')
-        .children('.cf-button--label')
-        .contains('Continue')
+        .contains('CONTINUE', {matchCase: false})
 
       // check cleared password
       cy.getByTestID('input-field--password').clear()
@@ -274,8 +263,7 @@ describe('Onboarding', () => {
 
       cy.getByTestID('next')
         .should('be.disabled')
-        .children('.cf-button--label')
-        .contains('Continue')
+        .contains('CONTINUE', {matchCase: false})
 
       cy.get<string>('@defaultPassword').then((defaultPassword: string) => {
         cy.getByTestID('input-field--password')
@@ -289,16 +277,14 @@ describe('Onboarding', () => {
 
       cy.getByTestID('next')
         .should('be.enabled')
-        .children('.cf-button--label')
-        .contains('Continue')
+        .contains('CONTINUE', {matchCase: false})
 
       // check cleared org name
       cy.getByTestID('input-field--orgname').clear()
 
       cy.getByTestID('next')
         .should('be.disabled')
-        .children('.cf-button--label')
-        .contains('Continue')
+        .contains('CONTINUE', {matchCase: false})
 
       cy.get<string>('@defaultOrg').then((defaultOrg: string) => {
         cy.getByTestID('input-field--orgname').type(defaultOrg)
@@ -306,23 +292,20 @@ describe('Onboarding', () => {
 
       cy.getByTestID('next')
         .should('be.enabled')
-        .children('.cf-button--label')
-        .contains('Continue')
+        .contains('CONTINUE', {matchCase: false})
 
       // check cleared bucket name
       cy.getByTestID('input-field--bucketname').clear()
 
       cy.getByTestID('next')
         .should('be.disabled')
-        .children('.cf-button--label')
-        .contains('Continue')
+        .contains('CONTINUE', {matchCase: false})
 
       cy.getByTestID('input-field--bucketname').type(defaultBucket)
     })
 
     cy.getByTestID('next')
       .should('be.enabled')
-      .children('.cf-button--label')
-      .contains('Continue')
+      .contains('CONTINUE', {matchCase: false})
   })
 })
diff --git a/cypress/e2e/shared/dashboardsIndex.test.ts b/cypress/e2e/shared/dashboardsIndex.test.ts
index 0c232c450b..30f341c3a7 100644
--- a/cypress/e2e/shared/dashboardsIndex.test.ts
+++ b/cypress/e2e/shared/dashboardsIndex.test.ts
@@ -314,12 +314,12 @@ describe('Dashboards', () => {
 
       // visit another page
       cy.getByTestID('tree-nav').then(() => {
-        cy.contains('Settings').click()
+        cy.contains('Settings').click({force: true})
         cy.contains(
           "Looks like there aren't any Variables, why not create one?"
         )
         // return to dashboards page
-        cy.contains('Boards').click()
+        cy.contains('Dashboards').click()
       })
 
       // assert dashboard order remains the same
diff --git a/cypress/e2e/shared/dashboardsRefresh.test.ts b/cypress/e2e/shared/dashboardsRefresh.test.ts
index f117781030..b8d1425239 100644
--- a/cypress/e2e/shared/dashboardsRefresh.test.ts
+++ b/cypress/e2e/shared/dashboardsRefresh.test.ts
@@ -61,7 +61,7 @@ describe('Dashboard refresh', () => {
         cy.getByTestID('page-title').click()
         cy.getByTestID('renamable-page-title--input')
           .clear()
-          .type('blah')
+          .type('blah{enter}')
         cy.getByTestID('save-cell--button').click()
       })
     })
@@ -74,7 +74,7 @@ describe('Dashboard refresh', () => {
       cy.getByTestID('auto-refresh-input')
         .clear()
         .type('2s')
-      cy.getByTestID('refresh-form-activate-button').click()
+      cy.getByTestID('refresh-form-activate-button').click({force: true})
       cy.wait('@refreshQuery')
       cy.getByTestID('enable-auto-refresh-button').click()
       // Wait the duration we'd expect on the next query to ensure stopping via the button actually stops the process. The fail means the request didn't run, which is what we want
@@ -92,6 +92,7 @@ describe('Dashboard refresh', () => {
       cy.getByTestID('auto-refresh-input')
         .clear()
         .type('4s')
+        .type('{enter}')
       cy.getByTestID('timerange-popover-button').click()
       cy.getByTestID('timerange-popover--dialog').within(() => {
         cy.getByTestID('timerange--input')
@@ -120,6 +121,7 @@ describe('Dashboard refresh', () => {
       cy.getByTestID('auto-refresh-input')
         .clear()
         .type('2s')
+        .type('{enter}')
       cy.getByTestID('timerange-popover-button').click()
       cy.getByTestID('timerange-popover--dialog').within(() => {
         cy.getByTestID('timerange--input')
@@ -155,15 +157,20 @@ describe('Dashboard refresh', () => {
       cy.visit(routeToReturnTo)
       cy.wait('@refreshQuery')
       cy.wait(5000)
-      cy.getByTestID('enable-auto-refresh-button').then(el => {
-        expect(el[0].innerText).to.equal('Enable Auto Refresh')
-      })
+      cy.getByTestID(
+        'enable-auto-refresh-button'
+      ).contains('ENABLE AUTO REFRESH', {matchCase: false})
     })
     it('can timeout on a preset inactivity timeout', done => {
+      cy.getByTestID(
+        'enable-auto-refresh-button'
+      ).contains('ENABLE AUTO REFRESH', {matchCase: false})
+
       cy.getByTestID('enable-auto-refresh-button').click()
       cy.getByTestID('auto-refresh-input')
         .clear()
         .type('3s')
+        .type('{enter}')
       cy.getByTestID('timerange-popover-button').click()
       cy.getByTestID('timerange-popover--dialog').within(() => {
         cy.getByTestID('timerange--input')
@@ -188,9 +195,9 @@ describe('Dashboard refresh', () => {
         })
 
       cy.wait(3100)
-      cy.getByTestID('enable-auto-refresh-button').then(el => {
-        expect(el[0].innerText).to.equal('Enable Auto Refresh')
-      })
+      cy.getByTestID(
+        'enable-auto-refresh-button'
+      ).contains('ENABLE AUTO REFRESH', {matchCase: false})
       cy.getByTestID('notification-success--children')
         .children()
         .should(
@@ -257,7 +264,7 @@ describe('Dashboard refresh', () => {
         cy.getByTestID('page-title').click()
         cy.getByTestID('renamable-page-title--input')
           .clear()
-          .type('blah')
+          .type('blah{enter}')
         cy.getByTestID('save-cell--button').click()
       })
 
@@ -296,7 +303,7 @@ describe('Dashboard refresh', () => {
       cy.getByTestID('auto-refresh-input')
         .clear()
         .type('2s')
-      cy.getByTestID('refresh-form-activate-button').click()
+      cy.getByTestID('refresh-form-activate-button').click({force: true})
       cy.wait('@secondCellQuery')
       cy.wait('@firstCellQuery')
 
@@ -356,7 +363,7 @@ describe('Dashboard refresh', () => {
         cy.getByTestID('page-title').click()
         cy.getByTestID('renamable-page-title--input')
           .clear()
-          .type('blah')
+          .type('blah{enter}')
         cy.getByTestID('save-cell--button').click()
       })
 
@@ -394,7 +401,7 @@ describe('Dashboard refresh', () => {
       cy.getByTestID('auto-refresh-input')
         .clear()
         .type('2s')
-      cy.getByTestID('refresh-form-activate-button').click()
+      cy.getByTestID('refresh-form-activate-button').click({force: true})
 
       cy.wait('@secondCellQuery')
       cy.getByTestID('cell blah').within(() => {
@@ -454,7 +461,7 @@ describe('Dashboard refresh', () => {
         cy.getByTestID('page-title').click()
         cy.getByTestID('renamable-page-title--input')
           .clear()
-          .type('blah')
+          .type('blah{enter}')
         cy.getByTestID('save-cell--button').click()
       })
 
@@ -540,7 +547,7 @@ describe('Dashboard refresh', () => {
         cy.getByTestID('page-title').click()
         cy.getByTestID('renamable-page-title--input')
           .clear()
-          .type('blah')
+          .type('blah{enter}')
         cy.getByTestID('save-cell--button').click()
       })
 
diff --git a/cypress/e2e/shared/dashboardsView.test.ts b/cypress/e2e/shared/dashboardsView.test.ts
index 188c760fba..40cd695665 100644
--- a/cypress/e2e/shared/dashboardsView.test.ts
+++ b/cypress/e2e/shared/dashboardsView.test.ts
@@ -67,6 +67,7 @@ describe('Dashboard', () => {
       cy.getByTestID('renamable-page-title--input')
         .clear()
         .type(xyCellName)
+        .type('{enter}')
       cy.getByTestID('save-cell--button').click()
     })
 
@@ -1284,7 +1285,7 @@ csv.from(csv: data) |> filter(fn: (r) => r.bucket == v.bucketsCSV)`
         cy.getByTestID('page-title').click()
         cy.getByTestID('renamable-page-title--input')
           .clear()
-          .type('blah')
+          .type('blah{enter}')
         cy.getByTestID('save-cell--button').click()
       })
       cy.getByTestID('cell-context--toggle')
diff --git a/cypress/e2e/shared/explorer.test.ts b/cypress/e2e/shared/explorer.test.ts
index 5ddc775414..60f81fa684 100644
--- a/cypress/e2e/shared/explorer.test.ts
+++ b/cypress/e2e/shared/explorer.test.ts
@@ -64,6 +64,7 @@ describe('DataExplorer', () => {
       })
       cy.contains('Submit').click()
       cy.get('.cf-tree-nav--toggle').click()
+      cy.getByTestID('nav-item-load-data').click()
       // Can't use the testID to select this nav item because Clockface is silly and uses the same testID twice
       // Issue: https://github.com/influxdata/clockface/issues/539
       cy.get('.cf-tree-nav--sub-item-label')
@@ -646,7 +647,7 @@ describe('DataExplorer', () => {
       // rename the first tab
       cy.get('.query-tab')
         .first()
-        .trigger('contextmenu')
+        .trigger('contextmenu', {force: true})
       cy.getByTestID('right-click--edit-tab').click()
       cy.getByTestID('edit-query-name').type('NewName{enter}')
       cy.get('.query-tab')
diff --git a/cypress/e2e/shared/flows.test.ts b/cypress/e2e/shared/flows.test.ts
index 192523c10e..b90a1e91b8 100644
--- a/cypress/e2e/shared/flows.test.ts
+++ b/cypress/e2e/shared/flows.test.ts
@@ -372,6 +372,8 @@ describe('Flows', () => {
     cy.getByTestID('resource-editable-name').click()
 
     // visualizations should exist
-    cy.getByTestID('giraffe-inner-plot').should('be.visible')
+    cy.getByTestID('giraffe-inner-plot')
+      .scrollIntoView()
+      .should('be.visible')
   })
 })
diff --git a/cypress/e2e/shared/legends.test.ts b/cypress/e2e/shared/legends.test.ts
index 4fd91879bf..edc2c68e27 100644
--- a/cypress/e2e/shared/legends.test.ts
+++ b/cypress/e2e/shared/legends.test.ts
@@ -478,7 +478,7 @@ describe('Legends', () => {
           cy.getByTestID('overlay').within(() => {
             cy.getByTestID('page-header')
               .click()
-              .type(cellName)
+              .type(cellName + '{enter}')
           })
 
           // Without submitting the query, save it to a dashboard
diff --git a/cypress/e2e/shared/nav.test.ts b/cypress/e2e/shared/nav.test.ts
index 7789b80b1d..38c67a0b0e 100644
--- a/cypress/e2e/shared/nav.test.ts
+++ b/cypress/e2e/shared/nav.test.ts
@@ -7,31 +7,36 @@ describe('navigation', () => {
 
   it('can navigate to each page from left nav', () => {
     // Load Data Page
-    cy.getByTestID('nav-item-load-data').click()
+    cy.getByTestID('nav-item-load-data').click({force: true})
+    cy.getByTestID('tabs').within(() => {
+      // buckets tab
+      cy.get('[id="buckets"]').click()
+      cy.url().should('contain', 'buckets')
+    })
     cy.getByTestID('load-data--header').should('exist')
 
     // Data Explorer Page
-    cy.getByTestID('nav-item-data-explorer').click()
+    cy.clickNavBarItem('nav-item-data-explorer')
     cy.getByTestID('data-explorer--header').should('exist')
 
     // Dashboard Index Page
-    cy.getByTestID('nav-item-dashboards').click()
+    cy.clickNavBarItem('nav-item-dashboards')
     cy.getByTestID('empty-dashboards-list').should('exist')
 
     // Tasks Index Page
-    cy.getByTestID('nav-item-tasks').click()
+    cy.clickNavBarItem('nav-item-tasks')
     cy.getByTestID('tasks-page--header').should('exist')
 
     // Alerts Page
-    cy.getByTestID('nav-item-alerting').click()
+    cy.clickNavBarItem('nav-item-alerting')
     cy.getByTestID('alerts-page--header').should('exist')
 
     // Settings Page
-    cy.getByTestID('nav-item-settings').click()
+    cy.clickNavBarItem('nav-item-settings')
     cy.getByTestID('settings-page--header').should('exist')
 
     // Home Page
-    cy.getByTestID('tree-nav--header').click()
+    cy.clickNavBarItem('tree-nav--header')
     cy.getByTestID('home-page--header').should('exist')
 
     // 404
@@ -96,7 +101,7 @@ describe('navigation', () => {
   })
 
   it('can navigate in tabs of data page', () => {
-    cy.getByTestID('nav-item-load-data').click()
+    cy.clickNavBarItem('nav-item-load-data')
 
     cy.getByTestID('tabs').within(() => {
       // buckets tab
@@ -131,12 +136,12 @@ describe('navigation', () => {
   }
 
   it('can navigate in tabs of settings page', () => {
-    cy.getByTestID('nav-item-settings').click()
+    cy.clickNavBarItem('nav-item-settings')
     exploreTabs(['templates', 'labels', 'variables'])
   })
 
   it('can navigate in tabs of collapsed alerts page', () => {
-    cy.getByTestID('nav-item-alerting').click()
+    cy.clickNavBarItem('nav-item-alerting')
     ;['checks', 'endpoints', 'rules'].forEach(tab => {
       cy.getByTestID(`alerting-tab--${tab}`).click()
       cy.getByTestID(`alerting-tab--${tab}--input`).should('to.be', 'checked')
@@ -145,7 +150,7 @@ describe('navigation', () => {
 
   it('can navigate in tabs from maximized left tree nav', () => {
     // TODO: check if nav is already maximized
-    cy.get('.cf-tree-nav--toggle').click()
+    cy.get('.cf-tree-nav--toggle').click({force: true})
     ;[
       'sources',
       'buckets',
@@ -155,11 +160,23 @@ describe('navigation', () => {
       'variables',
       'templates',
       'labels',
-    ].forEach(x => {
-      cy.getByTestID(`nav-subitem-${x}`)
+    ].forEach(navItem => {
+      if (navItem === 'history') {
+        cy.clickNavBarItem('nav-item-alerting')
+      } else if (
+        navItem === 'variables' ||
+        navItem === 'templates' ||
+        navItem === 'labels'
+      ) {
+        cy.clickNavBarItem('nav-item-settings')
+      } else {
+        cy.clickNavBarItem('nav-item-load-data')
+      }
+
+      cy.getByTestID(`nav-subitem-${navItem}`)
         .last()
         .click()
-      cy.url().should('contain', x)
+      cy.url().should('contain', navItem)
     })
 
     cy.get('.cf-tree-nav--toggle').click()
diff --git a/cypress/e2e/shared/queryBuilder.test.ts b/cypress/e2e/shared/queryBuilder.test.ts
index 4555a5f7c8..4dcb562779 100644
--- a/cypress/e2e/shared/queryBuilder.test.ts
+++ b/cypress/e2e/shared/queryBuilder.test.ts
@@ -217,7 +217,7 @@ describe('The Query Builder', () => {
       })
 
       // build query
-      cy.contains('mem').click('topLeft') // users sometimes click in random spots
+      cy.contains('mem').click('topLeft', {force: true}) // users sometimes click in random spots
       cy.contains('cached').click('bottomLeft')
       cy.contains('thrillbo-swaggins').click('left')
       cy.contains('sum').click()
@@ -228,7 +228,7 @@ describe('The Query Builder', () => {
       cy.getByTestID('overlay')
         .contains('Name this Cell')
         .click()
-      cy.get('[placeholder="Name this Cell"]').type('A better name!')
+      cy.get('[placeholder="Name this Cell"]').type('A better name!{enter}')
       cy.get('.veo-contents').click() // click out of inline editor
       cy.getByTestID('save-cell--button').click()
 
diff --git a/cypress/e2e/shared/variables.test.ts b/cypress/e2e/shared/variables.test.ts
index ae45e34009..0d5802c4db 100644
--- a/cypress/e2e/shared/variables.test.ts
+++ b/cypress/e2e/shared/variables.test.ts
@@ -16,8 +16,8 @@ describe('Variables', () => {
 
   it('can CRUD a CSV, upload, map, and query variable and search for variables based on names', () => {
     // Navigate away from and back to variables index using the nav bar
-    cy.getByTestID('nav-item-dashboards').click()
-    cy.getByTestID('nav-item-settings').click()
+    cy.clickNavBarItem('nav-item-dashboards')
+    cy.clickNavBarItem('nav-item-settings')
     cy.getByTestID('templates--tab').click()
     cy.getByTestID('variables--tab').click()
 
@@ -342,7 +342,9 @@ describe('Variables', () => {
     cy.getByTestID('inline-labels--popover--contents').type(labelName)
     cy.getByTestID('inline-labels--create-new').click()
 
-    cy.getByTestID('create-label-form--submit').should('be.visible')
+    cy.getByTestID('create-label-form--submit')
+      .scrollIntoView()
+      .should('be.visible')
     cy.getByTestID('create-label-form--submit').click()
 
     cy.getByTestID('overlay--children').should('not.exist')
@@ -448,27 +450,33 @@ describe('Variables', () => {
     cy.get('button.inline-labels--add')
       .first()
       .clickAttached()
-    cy.getByTestID('inline-labels--popover--contents').type(firstLabelName)
+    cy.getByTestID('inline-labels--popover-field').type(firstLabelName)
     cy.getByTestID('inline-labels--create-new').click()
-    cy.getByTestID('create-label-form--submit').should('be.visible')
+    cy.getByTestID('create-label-form--submit')
+      .scrollIntoView()
+      .should('be.visible')
     cy.getByTestID('create-label-form--submit').click()
 
     const secondLabelName = 'query'
     cy.get('button.inline-labels--add')
       .eq(1)
       .clickAttached()
-    cy.getByTestID('inline-labels--popover--contents').type(secondLabelName)
+    cy.getByTestID('inline-labels--popover-field').type(secondLabelName)
     cy.getByTestID('inline-labels--create-new').click()
-    cy.getByTestID('create-label-form--submit').should('be.visible')
+    cy.getByTestID('create-label-form--submit')
+      .scrollIntoView()
+      .should('be.visible')
     cy.getByTestID('create-label-form--submit').click()
 
     const thirdLabelName = 'csv'
     cy.get('button.inline-labels--add')
       .last()
       .clickAttached()
-    cy.getByTestID('inline-labels--popover--contents').type(thirdLabelName)
+    cy.getByTestID('inline-labels--popover-field').type(thirdLabelName)
     cy.getByTestID('inline-labels--create-new').click()
-    cy.getByTestID('create-label-form--submit').should('be.visible')
+    cy.getByTestID('create-label-form--submit')
+      .scrollIntoView()
+      .should('be.visible')
     cy.getByTestID('create-label-form--submit').click()
 
     // Select ascending order and use filter on variable name
diff --git a/cypress/e2e/util/annotationsSetup.ts b/cypress/e2e/util/annotationsSetup.ts
index b8ba20b27e..3b73d4d6ab 100644
--- a/cypress/e2e/util/annotationsSetup.ts
+++ b/cypress/e2e/util/annotationsSetup.ts
@@ -54,7 +54,7 @@ export const setupData = (cy: Cypress.Chainable, plotTypeSuffix = '') =>
                   cy.getByTestID('page-title').click()
                   cy.getByTestID('renamable-page-title--input')
                     .clear()
-                    .type('blah')
+                    .type('blah{enter}')
                   cy.getByTestID('save-cell--button').click()
                 })
 
diff --git a/cypress/index.d.ts b/cypress/index.d.ts
index 096e1e8953..672bce9834 100644
--- a/cypress/index.d.ts
+++ b/cypress/index.d.ts
@@ -15,6 +15,7 @@ import {
   getByInputValue,
   getByTestIDAndSetInputValue,
   getByTitle,
+  clickNavBarItem,
   createTask,
   createMapVariable,
   createCSVVariable,
@@ -56,6 +57,7 @@ declare global {
       signin: typeof signin
       setupUser: typeof setupUser
       clickAttached: typeof clickAttached
+      clickNavBarItem: typeof clickNavBarItem
       createSource: typeof createSource
       createCSVVariable: typeof createCSVVariable
       createQueryVariable: typeof createQueryVariable
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index a355513fad..485abe7439 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -297,6 +297,11 @@ export const upsertSecret = (
   })
 }
 
+// TODO: (sahas) need to make this function to actually mimic the navbar functionality
+export const clickNavBarItem = (testID: string): Cypress.Chainable => {
+  return cy.getByTestID(testID).click({force: true})
+}
+
 export const createTask = (
   token: string,
   orgID?: string,
@@ -985,6 +990,9 @@ Cypress.Commands.add(
   wrapEnvironmentVariablesForOss
 )
 
+// navigation bar
+Cypress.Commands.add('clickNavBarItem', clickNavBarItem)
+
 // dashboards
 Cypress.Commands.add('createDashboard', createDashboard)
 Cypress.Commands.add('createCell', createCell)
diff --git a/package.json b/package.json
index 001c1c29df..2f8364ab8d 100644
--- a/package.json
+++ b/package.json
@@ -164,7 +164,7 @@
   },
   "dependencies": {
     "@docsearch/react": "^3.0.0-alpha.37",
-    "@influxdata/clockface": "^2.11.7",
+    "@influxdata/clockface": "^3.0.0-beta.7",
     "@influxdata/flux": "^0.5.1",
     "@influxdata/flux-lsp-browser": "^0.5.53",
     "@influxdata/giraffe": "^2.18.0",
diff --git a/src/checkout/shared/FormToggle.tsx b/src/checkout/shared/FormToggle.tsx
index 054c2b5dcc..429ccc7b23 100644
--- a/src/checkout/shared/FormToggle.tsx
+++ b/src/checkout/shared/FormToggle.tsx
@@ -17,8 +17,11 @@ const FormToggle: FC<FormToggleProps> = ({label, ...props}) => {
       checked={inputs.shouldNotify}
       onChange={() => handleSetInputs('shouldNotify', !inputs.shouldNotify)}
       testID={`${props.id}--checkbox`}
+      id="shouldNotify--checkbox"
     >
-      <InputLabel wrapText={true}>{label}</InputLabel>
+      <InputLabel wrapText={true} htmlFor="shouldNotify--checkbox">
+        {label}
+      </InputLabel>
     </Toggle>
   )
 }
diff --git a/src/shared/components/DurationInput.tsx b/src/shared/components/DurationInput.tsx
index 32663e824f..225dc80318 100644
--- a/src/shared/components/DurationInput.tsx
+++ b/src/shared/components/DurationInput.tsx
@@ -92,6 +92,11 @@ const DurationInput: FC<Props> = ({
           status={inputStatus}
           onChange={e => onChange(e.target.value)}
           onFocus={() => setIsFocused(true)}
+          onKeyPress={evt => {
+            if (evt.key === 'Enter') {
+              setIsFocused(false)
+            }
+          }}
           testID={testID}
         />
       </ClickOutside>
diff --git a/src/timeMachine/components/TimeMachine.tsx b/src/timeMachine/components/TimeMachine.tsx
index 31796387c9..d8ab49a991 100644
--- a/src/timeMachine/components/TimeMachine.tsx
+++ b/src/timeMachine/components/TimeMachine.tsx
@@ -18,7 +18,7 @@ import {getActiveTimeMachine} from 'src/timeMachine/selectors'
 import {AppState, TimeMachineTab} from 'src/types'
 import ErrorBoundary from 'src/shared/components/ErrorBoundary'
 
-const INITIAL_RESIZER_HANDLE = 0.5
+const INITIAL_RESIZER_HANDLE = 0.3
 
 interface StateProps {
   activeTab: TimeMachineTab
diff --git a/src/variables/components/TypeAheadVariableDropdown.tsx b/src/variables/components/TypeAheadVariableDropdown.tsx
index eed1d24a25..09d180529e 100644
--- a/src/variables/components/TypeAheadVariableDropdown.tsx
+++ b/src/variables/components/TypeAheadVariableDropdown.tsx
@@ -284,6 +284,7 @@ class TypeAheadVariableDropdown extends PureComponent<Props, MyState> {
         testID={this.props.testID || `variable-dropdown--${name}`}
         onClickAway={this.onClickAwayHere}
         menuOpen={menuOpen}
+        disableAutoFocus
         button={(active, onClick) => (
           <Dropdown.Button
             active={active}
diff --git a/yarn.lock b/yarn.lock
index 1026e22d82..54b1ba0e9b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -848,10 +848,10 @@
     "@docsearch/css" "3.0.0-alpha.37"
     algoliasearch "^4.0.0"
 
-"@influxdata/clockface@^2.11.7":
-  version "2.11.7"
-  resolved "https://registry.yarnpkg.com/@influxdata/clockface/-/clockface-2.11.7.tgz#0a204f66a81fff9a2ed2d24113831e4c4c25f832"
-  integrity sha512-aifavOC6fEFdeIZAHIxpf8+ieUSB3SGODj0jNTJYqC//gziPkK9V6WQ9ZcmWPlKouqzb6ZXl5elWb1s1j0wszg==
+"@influxdata/clockface@^3.0.0-beta.7":
+  version "3.0.0-beta.7"
+  resolved "https://registry.yarnpkg.com/@influxdata/clockface/-/clockface-3.0.0-beta.7.tgz#6638e1fa5d6a18faf66fbaeaccb5c5fb8eab0c9c"
+  integrity sha512-UhIewGaJoWTJG57AgfBE++U1Wctzjhf2jBmnf7RI0gF6nc5RwJ9AxS+SAXkCnmRf3gHT5DGqUoEPXkRxyd+OaQ==
 
 "@influxdata/flux-lsp-browser@^0.5.53":
   version "0.5.53"