diff --git a/app/src/components/AuthForm.vue b/app/src/components/AuthForm.vue
index d2e99a5..034cc7f 100644
--- a/app/src/components/AuthForm.vue
+++ b/app/src/components/AuthForm.vue
@@ -41,7 +41,7 @@ const hasSocialLogins = computed(() => {
 })
 
 const success = () => {
-  router.push({ name: 'game', params: { questId: 'helloworld' } })
+  router.push({ name: 'map' })
 }
 
 const error = (err) => {
diff --git a/app/src/components/ControlPalette.vue b/app/src/components/ControlPalette.vue
index 522a6f4..7a6603b 100644
--- a/app/src/components/ControlPalette.vue
+++ b/app/src/components/ControlPalette.vue
@@ -20,12 +20,16 @@
         重來
       </p>
     </button>
-    <button id="continue" class="bg-bg-disabled rounded-lg p-2">
+    <button
+      id="continue"
+      class="bg-bg-secondary rounded-lg p-2"
+      @click="continuePlay"
+    >
       <font-awesome-icon
         :icon="['far', 'circle-right']"
-        class="text-text-disabled"
+        class="text-text-primary"
       />
-      <p class="text-text-disabled inline ml-1">
+      <p class="text-text-primary inline ml-1">
         <!-- Continue -->
         繼續
       </p>
@@ -34,10 +38,22 @@
 </template>
 
 <script setup>
+import { useRouter } from 'vue-router'
+import { useToast } from 'vue-toastification'
 import { createSession } from '../store/session'
 
+const router = useRouter()
 const reset = async () => {
   console.log('resetting...')
   await createSession()
 }
+const continuePlay = async () => {
+  try {
+    router.push({ name: 'map' })
+  } catch (err) {
+    // useToast().error('Failed to load map')
+    useToast().error('無法讀取地圖')
+    console.error(err)
+  }
+}
 </script>
diff --git a/app/src/components/GameHeaderPart.vue b/app/src/components/GameHeaderPart.vue
index 83eab30..60b7980 100644
--- a/app/src/components/GameHeaderPart.vue
+++ b/app/src/components/GameHeaderPart.vue
@@ -15,7 +15,17 @@ const handleLogout = async () => {
     reset()
     router.push({ name: 'login' })
   } catch (err) {
-    toast.error('Failed to logout')
+    // toast.error('Failed to logout')
+    toast.error('登出失敗')
+    console.error(err)
+  }
+}
+const handleMap = async () => {
+  try {
+    router.push({ name: 'map' })
+  } catch (err) {
+    // toast.error('Failed to load map')
+    toast.error('無法讀取地圖')
     console.error(err)
   }
 }
@@ -65,6 +75,12 @@ const handleLogout = async () => {
             class="text-text-primary h-full w-full"
           />
         </button> -->
+        <button title="Map" @click="handleMap" class="h-5 w-5">
+          <font-awesome-icon
+            :icon="['fas', 'map']"
+            class="text-text-primary h-full w-full"
+          />
+        </button>
         <a
           title="Bug Report"
           :href="bugReportUrl"
diff --git a/app/src/library.js b/app/src/library.js
index 459a96b..ce54cea 100644
--- a/app/src/library.js
+++ b/app/src/library.js
@@ -15,6 +15,7 @@ import {
   faArrowRight,
   faBug,
   faCircleExclamation,
+  faMap,
 } from '@fortawesome/free-solid-svg-icons'
 import {
   faLightbulb,
@@ -36,6 +37,7 @@ library.add(
   faArrowRightFromBracket,
   faArrowRight,
   faBug,
+  faMap,
   faCircleExclamation,
   faLightbulb,
   faCircleQuestion,