diff --git a/cypress.config.js b/cypress.config.js
index 9cf6a19977508071fc39540bf0a49510b8802595..de4d849beb7110668c2af7bfd4e55d07b1c275d8 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -3,6 +3,6 @@ const { defineConfig } = require('cypress')
 module.exports = defineConfig({
   e2e: {
     specPattern: 'cypress/e2e/**/*.{cy,spec}.{js,jsx,ts,tsx}',
-    baseUrl: 'http://localhost:4173'
+    baseUrl: 'http://localhost:5173'
   }
 })
diff --git a/cypress/e2e/navbar.cy.js b/cypress/e2e/navbar.cy.js
index 2cbd9b1ad9230819d7890632705bb94da06736a4..68eeaa68fc072618c4b1ea699a8489931606d32f 100644
--- a/cypress/e2e/navbar.cy.js
+++ b/cypress/e2e/navbar.cy.js
@@ -1,6 +1,25 @@
 describe('Correct navigation links', () => {
-    /*TODO*/
+    it("is sent to error page if page does not exist", () => {
+        cy.visit('/qwerty')
+        cy.contains('#msg', '404')
+    })
+
+    it("navigates to settings page", () => {
+        cy.visit('/')
+        cy.get('#settingsIcon').click()
+        cy.url().should('include', '/profileSettings')
+    })
+    /*TODO: Other pages*/
 })
 describe('Navbar on all pages', () => {
-  /*TODO*/
+    it("front page has a navbar",()=> {
+        cy.visit('/')
+        cy.get('nav').should('exist')
+    })
+
+    it("settings page has a navbar",()=> {
+        cy.visit('/profileSettings')
+        cy.get('nav').should('exist')
+    })
+  /*TODO: other pages*/
 })
\ No newline at end of file
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index 13648572d136d53356ba2f0573775647875e7f90..b71d45bd55cf1751c76ee61c24974d2906b148ae 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -26,8 +26,8 @@
                     </RouterLink>
                 </li>
                 <li>
-                    <RouterLink :to="'/'" :aria-label="'link to settings page'">
-                      <Icon icon="mdi:cog" :color="iconColor" :style="{ fontSize: iconSize }"/>
+                    <RouterLink :to="'/profileSettings'" :aria-label="'link to settings page'">
+                      <Icon id="settingsIcon" icon="mdi:cog" :color="iconColor" :style="{ fontSize: iconSize }"/>
                     </RouterLink>
                 </li>
             </ul>
diff --git a/src/views/MissingPage.vue b/src/views/MissingPage.vue
index 1f97af7f942b888722e859f63aeb947856967c53..e110350375e236a41a035386fb3a907cdccc37e9 100644
--- a/src/views/MissingPage.vue
+++ b/src/views/MissingPage.vue
@@ -1,5 +1,5 @@
 <template>
-    <h1>404</h1>
+    <h1 id="msg">404</h1>
     <h2>Oida, denne siden finnes ikke</h2>
     <RouterLink to="/">GÃ¥ tilbake til forsiden</RouterLink>
 </template>