diff --git a/NUXT/pages/index.vue b/NUXT/pages/index.vue
index 2af18ee..55c0589 100644
--- a/NUXT/pages/index.vue
+++ b/NUXT/pages/index.vue
@@ -12,7 +12,7 @@
 
 <script>
 export default {
-  layout: "empty",  
+  layout: "empty",
 
   //---   Hide Splash Screen   ---//
   async beforeCreate() {
diff --git a/NUXT/pages/mods/about.vue b/NUXT/pages/mods/about.vue
index c3e29c6..30d0ad7 100644
--- a/NUXT/pages/mods/about.vue
+++ b/NUXT/pages/mods/about.vue
@@ -28,7 +28,7 @@
     <div>OS: {{ deviceInfo.operatingSystem }} ({{ deviceInfo.osVersion }})</div>
     <div>Model: {{ deviceInfo.model }}</div>
     <div>Manufacturer: {{ deviceInfo.manufacturer }}</div>
-    <div>Virtual Device: {{ deviceInfo.isVirtual ? 'yes' : 'no'  }}</div>
+    <div>Virtual Device: {{ deviceInfo.isVirtual ? "yes" : "no" }}</div>
   </center>
 </template>
 
diff --git a/NUXT/pages/search.vue b/NUXT/pages/search.vue
index 1e89bfd..ec410ea 100644
--- a/NUXT/pages/search.vue
+++ b/NUXT/pages/search.vue
@@ -34,17 +34,6 @@ export default {
       renderer: [],
     };
   },
-  mounted() {
-    this.getSearch();
-  },
-  methods: {
-    getSearch() {
-      const searchQuestion = this.$route.query.q;
-      this.$youtube.search(searchQuestion).then((response) => {
-        this.renderer = response;
-      });
-    },
-  },
   watch: {
     // Watches for new searches while the current search page is active.
     $route: {
@@ -56,5 +45,16 @@ export default {
       },
     },
   },
+  mounted() {
+    this.getSearch();
+  },
+  methods: {
+    getSearch() {
+      const searchQuestion = this.$route.query.q;
+      this.$youtube.search(searchQuestion).then((response) => {
+        this.renderer = response;
+      });
+    },
+  },
 };
 </script>
diff --git a/NUXT/pages/watch.vue b/NUXT/pages/watch.vue
index 1dd0c10..0e463e3 100644
--- a/NUXT/pages/watch.vue
+++ b/NUXT/pages/watch.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="accent">
-    <videoPlayer :vidSrc="vidSrc" />
+    <videoPlayer :vid-src="vidSrc" />
     <v-card v-if="loaded" class="ml-2 mr-2 accent" flat>
       <v-card-title
         class="mt-2"
@@ -134,6 +134,21 @@ export default {
       loaded: false,
     };
   },
+  watch: {
+    // Watch for change in the route query string (in this case, ?v=xxxxxxxx to ?v=yyyyyyyy)
+    $route: {
+      deep: true,
+      handler(newRt, oldRt) {
+        if (newRt.query.v != oldRt.query.v) {
+          // Exit fullscreen if currently in fullscreen
+          this.$refs.player.webkitExitFullscreen();
+          // Reset player and run getVideo function again
+          this.vidSrc = "";
+          this.getVideo();
+        }
+      },
+    },
+  },
   mounted() {
     this.getVideo();
   },
@@ -183,20 +198,5 @@ export default {
       });
     },
   },
-  watch: {
-    // Watch for change in the route query string (in this case, ?v=xxxxxxxx to ?v=yyyyyyyy)
-    $route: {
-      deep: true,
-      handler(newRt, oldRt) {
-        if (newRt.query.v != oldRt.query.v) {
-          // Exit fullscreen if currently in fullscreen
-          this.$refs.player.webkitExitFullscreen();
-          // Reset player and run getVideo function again
-          this.vidSrc = "";
-          this.getVideo();
-        }
-      },
-    },
-  },
 };
 </script>