diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index f5c091b4d8..8e0a93b450 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -11,9 +11,7 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
   browser
     .url(url || 'http://127.0.0.1:8080')
     //.switchBrowserTab(0)
-    .waitForElementVisible('[id="remixTourSkipbtn"]')
-    .click('[id="remixTourSkipbtn"]')
-
+    
     .perform((done) => {
       if (!loadPlugin) return done()
       browser
diff --git a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
index 35398ef75b..c6cd47f61d 100644
--- a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
+++ b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
@@ -11,8 +11,7 @@ module.exports = {
       .maximizeWindow()
       .waitForElementVisible('*[data-id="skipbackup-btn"]', 5000)
       .click('*[data-id="skipbackup-btn"]')
-      .waitForElementVisible('[id="remixTourSkipbtn"]')
-      .click('[id="remixTourSkipbtn"]')
+      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
   },
   'Should load the testmigration url and refresh and still have test data #group7': function (browser: NightwatchBrowser) {
     browser.url('http://127.0.0.1:8080?e2e_testmigration=true')
@@ -21,8 +20,8 @@ module.exports = {
       .maximizeWindow()
       .waitForElementVisible('*[data-id="skipbackup-btn"]', 5000)
       .click('*[data-id="skipbackup-btn"]')
-      .waitForElementVisible('[id="remixTourSkipbtn"]')
-      .click('[id="remixTourSkipbtn"]').refreshPage()
+      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
+      .refreshPage()
   },
   'should have indexedDB storage in terminal #group1 #group7': function (browser: NightwatchBrowser) {
     browser.assert.containsText('*[data-id="terminalJournal"]', 'indexedDB')
@@ -32,9 +31,7 @@ module.exports = {
       .pause(6000)
       .switchBrowserTab(0)
       .maximizeWindow()
-      .waitForElementVisible('[id="remixTourSkipbtn"]')
-      .click('[id="remixTourSkipbtn"]')
-      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
+      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
       .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
       .openFile('README.txt')
       .getEditorValue((content) => {
@@ -53,8 +50,7 @@ module.exports = {
       .maximizeWindow()
       .waitForElementVisible('*[data-id="skipbackup-btn"]', 5000)
       .click('*[data-id="skipbackup-btn"]')
-      .waitForElementVisible('[id="remixTourSkipbtn"]')
-      .click('[id="remixTourSkipbtn"]')
+      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
   },
   'Should generate error in migration by deleting indexedDB and falling back to local storage with test #group5': function (browser: NightwatchBrowser) {
     browser.url('http://127.0.0.1:8080?e2e_testmigration=true')
@@ -63,8 +59,7 @@ module.exports = {
       .maximizeWindow().execute(('delete window.indexedDB'))
       .waitForElementVisible('*[data-id="skipbackup-btn"]', 5000)
       .click('*[data-id="skipbackup-btn"]')
-      .waitForElementVisible('[id="remixTourSkipbtn"]')
-      .click('[id="remixTourSkipbtn"]')
+      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
   },
   'should have localstorage storage in terminal #group2 #group3 #group5': function (browser: NightwatchBrowser) {
     browser.assert.containsText('*[data-id="terminalJournal"]', 'localstorage')
@@ -74,6 +69,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
       .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
       .openFile('TEST_README.txt')
+      .pause(6000)
       .getEditorValue((content) => {
         browser.assert.equal(content, 'TEST README')
       })
diff --git a/libs/remix-ui/app/src/lib/remix-app/components/modals/enter.tsx b/libs/remix-ui/app/src/lib/remix-app/components/modals/enter.tsx
index b5199664f8..b13cd5adc2 100644
--- a/libs/remix-ui/app/src/lib/remix-app/components/modals/enter.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/components/modals/enter.tsx
@@ -40,7 +40,7 @@ const EnterDialog = (props: EnterDialogProps) => {
             <h3 className='text-dark'>Welcome to Remix IDE</h3>
             <div className='d-flex flex-row pt-2'>
               <h6 className="modal-title" data-id={`EnterModalDialogModalTitle-react`}>
-                To load the project with the most efficient setup we would like to know your experiance type.
+                To load the project with the most efficient setup we would like to know your experience type.
               </h6>
               <i className="text-dark fal fa-door-open text-center" style={{minWidth: "100px", fontSize: "xxx-large"}}></i>
             </div>
diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index 72e84bfe30..8aaac1c419 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -135,8 +135,7 @@ const RemixApp = (props: IRemixAppUi) => {
     <IntlProvider locale={locale.code} messages={locale.messages}>
       <AppProvider value={value}>
         <OriginWarning></OriginWarning>
-        <MatomoDialog hide={!appReady} okFn={() => {setShowEnterDialog(true)}}>
-        </MatomoDialog>
+        <MatomoDialog hide={!appReady} okFn={() => {setShowEnterDialog(true)}}></MatomoDialog>
         <EnterDialog hide={!showEnterDialog} handleUserChoice={(type) => handleUserChosenType(type)}></EnterDialog>
         <div className={`remixIDE ${appReady ? '' : 'd-none'}`} data-id="remixIDE">
           <div id="icon-panel" data-id="remixIdeIconPanel" className="custom_icon_panel iconpanel bg-light">