diff --git a/src/App.vue b/src/App.vue
index 85d833b..04eb49c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,13 +3,5 @@
 </script>
 
 <template>
-  <!-- <header>
-    <div class="wrapper">
-      <nav>
-        <RouterLink to="/">Home</RouterLink>
-        <router-link to="/favoritelist">FavoriteList</router-link>
-      </nav>
-    </div>
-  </header> -->
   <RouterView />
 </template>
diff --git a/src/views/FavoriteList.vue b/src/views/FavoriteList.vue
index 1629e10..2a8f831 100644
--- a/src/views/FavoriteList.vue
+++ b/src/views/FavoriteList.vue
@@ -38,9 +38,6 @@
           (favMovie) => favMovie.imdbID === movie.imdbID,
         )
       },
-      goBack() {
-        this.$router.push('/')
-      },
       loadAnimation() {
         lottie.loadAnimation({
           container: this.$refs.title,
@@ -62,7 +59,7 @@
     <div
       class="navbar bg-black flex items-center justify-between shadow-md fixed z-10 px-5"
     >
-      <button @click="goBack" class="btn">GO Back</button>
+      <router-link to="/" class="btn">GO Back</router-link>
       <p ref="title" class="text-4xl text-center px-3 w-52"></p>
       <div class="w-24"></div>
     </div>
diff --git a/src/views/MoviesSearch.vue b/src/views/MoviesSearch.vue
index 2b3cdb5..254d5e1 100644
--- a/src/views/MoviesSearch.vue
+++ b/src/views/MoviesSearch.vue
@@ -79,9 +79,6 @@
           (favMovie) => favMovie.imdbID === movie.imdbID,
         )
       },
-      goToFavorites() {
-        this.$router.push('/favoritelist') //導到其他頁面
-      },
       loadAnimation() {
         lottie.loadAnimation({
           container: this.$refs.title,
@@ -92,7 +89,6 @@
         })
       },
     },
-    computed: {},
   }
 </script>
 
@@ -135,12 +131,12 @@
         >
           Search
         </button>
-        <button
-          @click="goToFavorites"
+        <router-link
+          to="/favoritelist"
           class="btn btn-secondary w-full md:w-auto"
         >
           My Favorite
-        </button>
+        </router-link>
       </div>
       <div><button type="button"></button></div>
     </div>
@@ -207,7 +203,7 @@
             </ul>
           </div>
           <div class="flex items-center justify-between p-3">
-            <div class="flex items-center gap-2">
+            <div class="flex flex-wrap items-center gap-2">
               <div
                 v-for="(text, index) in movie.Genre.split(',')"
                 :key="index"