diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
index a1ce72c..b850467 100644
--- a/src/components/Navbar.vue
+++ b/src/components/Navbar.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, onMounted, onUnmounted } from 'vue';
+
 // Icons are from https://fonts.google.com/ names might be different but rely on vscode intelisense to get the matching name
 import MapIcon from 'vue-material-design-icons/Map.vue';
 import InformationIcon from 'vue-material-design-icons/Information.vue';
@@ -12,21 +13,35 @@ import TuneIcon from 'vue-material-design-icons/Tune.vue';
 import BugIcon from 'vue-material-design-icons/Bug.vue';
 import PowerPlugIcon from 'vue-material-design-icons/PowerPlug.vue';
 import ControllerIcon from 'vue-material-design-icons/ControllerClassic.vue';
+
 import { useRoslibStore } from '@/store/roslibStore';
 import { useControllerStore } from '@/store/controllerStore';
 import { useOperationStateStore } from '../store/operationStateStore';
-import { onMounted } from 'vue';
+import { useRouter } from 'vue-router';
 
 const roslib = useRoslibStore();
 const controller = useControllerStore();
 const operation = useOperationStateStore();
 const currentTab = ref(0);
+const router = useRouter();
+
 const setCurrentTab = (newValue: number) => {
   currentTab.value = newValue;
+  sessionStorage.setItem('currentTab', newValue.toString());
+  router.push(pageIconArr[newValue].label);
 };
 
 onMounted(() => {
   operation.operationStateSub.start();
+
+  const savedTab = sessionStorage.getItem('currentTab');
+  if (savedTab != null) {
+    currentTab.value = parseInt(savedTab, 10);
+  }
+});
+
+onUnmounted(() => {
+  operation.operationStateSub.stop();
 });
 
 type PageIcon = { icon: object; label: string; helperText: string }[];
diff --git a/src/main.ts b/src/main.ts
index 72ede34..2be2558 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,7 +3,7 @@ import App from './App.vue';
 import Home from './pages/Home.vue';
 import Map from './pages/Map.vue';
 import Cameras from './pages/Cameras.vue';
-import { createMemoryHistory, createRouter } from 'vue-router';
+import { createRouter, createWebHistory } from 'vue-router';
 import DevTab from './pages/DevTab.vue';
 import Arm from './pages/Arm.vue';
 import Science from './pages/Science.vue';
@@ -26,7 +26,7 @@ const routes = [
 ];
 
 const router = createRouter({
-  history: createMemoryHistory(),
+  history: createWebHistory(),
   routes,
 });