diff --git a/NUXT/components/Player/index.vue b/NUXT/components/Player/index.vue
index b07280f..f44c5ee 100644
--- a/NUXT/components/Player/index.vue
+++ b/NUXT/components/Player/index.vue
@@ -406,7 +406,7 @@ export default {
     if (this.$store.state.player.preload) this.prebuffer(this.sources[0].url);
     else {
       this.audSrc = this.sources[this.sources.length - 1].url;
-      this.vidSrc = this.sources[0].url;
+      this.vidSrc = this.sources[3].url;
     }
 
     this.$youtube.getSponsorBlock(this.video.id, (data) => {
diff --git a/NUXT/components/topNavigation.vue b/NUXT/components/topNavigation.vue
index 03d381a..c7f9d7a 100644
--- a/NUXT/components/topNavigation.vue
+++ b/NUXT/components/topNavigation.vue
@@ -63,11 +63,17 @@
       v-show="!search"
       icon
       tile
-      class="ml-4 mr-2 my-auto fill-height"
-      style="border-radius: 0.25rem !important"
-      to="/settings"
+      class="ml-4 mr-2 my-auto fill-height rounded-xl"
+      :style="$route.name !== 'settings' ? '' : 'transform: rotate(180deg)'"
+      @click="
+        $route.path.includes('settings') || $route.path.includes('/tweaks')
+          ? $router.go(-1)
+          : $router.push('/settings')
+      "
     >
-      <v-icon>mdi-cog-outline</v-icon>
+      <v-icon>{{
+        $route.name !== "settings" ? "mdi-cog-outline" : "mdi-close"
+      }}</v-icon>
     </v-btn>
   </v-card>
 </template>
diff --git a/NUXT/pages/mods/player.vue b/NUXT/pages/mods/player.vue
index 9095396..df63152 100644
--- a/NUXT/pages/mods/player.vue
+++ b/NUXT/pages/mods/player.vue
@@ -190,6 +190,104 @@
 
     <v-divider v-if="!$store.state.tweaks.roundTweak" />
 
+    <h3 class="ml-8 mt-8">
+      <v-icon class="mb-1 mr-1">mdi-youtube</v-icon>
+      Quality <b class="ml-1">&middot;</b> 1080p
+    </h3>
+
+    <v-card
+      flat
+      class="mx-4 my-2 background"
+      style="overflow: hidden"
+      :style="{
+        borderRadius: `${$store.state.tweaks.roundTweak / 2}rem`,
+      }"
+    >
+      <v-card
+        flat
+        class="pa-4 d-flex flex-row justify-space-between background"
+        :class="
+          $store.state.tweaks.roundTweak > 0
+            ? $vuetify.theme.dark
+              ? 'lighten-1'
+              : 'darken-1'
+            : ''
+        "
+        :style="{
+          borderRadius: `${$store.state.tweaks.roundTweak / 8}rem`,
+        }"
+      >
+        <div>
+          <div>
+            <v-icon class="mb-1 mr-1" v-text="'mdi-video-outline'" />Video Codec
+          </div>
+          <div
+            class="background--text pr-4"
+            :class="$vuetify.theme.dark ? 'text--lighten-4' : 'text--darken-4'"
+            style="font-size: 0.75rem"
+          >
+            Just pick VP9
+          </div>
+        </div>
+        <div
+          class="background d-flex flex-row justify-end rounded-lg"
+          style="max-width: content-width; overflow: hidden"
+          :style="{
+            borderRadius: `${$store.state.tweaks.roundTweak / 3}rem`,
+          }"
+          slider-size="0"
+        >
+          <v-tab active-class="primary darken-4">AVC</v-tab>
+          <v-tab active-class="primary darken-4">VP9</v-tab>
+        </div>
+      </v-card>
+      <marquee class="background--text mt-2">
+        <b class="primary pa-2 rounded-xl">
+          still in progress, not functional yet.
+        </b>
+      </marquee>
+      <v-card
+        flat
+        class="pa-4 d-flex flex-row justify-space-between background"
+        :class="
+          $store.state.tweaks.roundTweak > 0
+            ? $vuetify.theme.dark
+              ? 'lighten-1'
+              : 'darken-1'
+            : ''
+        "
+        :style="{
+          borderRadius: `${$store.state.tweaks.roundTweak / 8}rem`,
+        }"
+      >
+        <div
+          class="background d-flex flex-row justify-end rounded-lg"
+          style="max-width: content-width; overflow: hidden"
+          :style="{
+            borderRadius: `${$store.state.tweaks.roundTweak / 3}rem`,
+          }"
+          slider-size="0"
+        >
+          <v-tab active-class="primary darken-4">OGG OPUS</v-tab>
+          <v-tab active-class="primary darken-4">MP4 MP4a</v-tab>
+        </div>
+        <div class="d-flex flex-column align-end">
+          <div>
+            <v-icon class="mb-1 mr-1" v-text="'mdi-music-note'" />Audio Codec
+          </div>
+          <div
+            class="background--text"
+            :class="$vuetify.theme.dark ? 'text--lighten-4' : 'text--darken-4'"
+            style="font-size: 0.75rem"
+          >
+            OGG is better
+          </div>
+        </div>
+      </v-card>
+    </v-card>
+
+    <v-divider v-if="!$store.state.tweaks.roundTweak" />
+
     <h3 class="ml-8 mt-8">
       <v-icon class="mb-1 mr-1">mdi-cog-play</v-icon>
       Other
@@ -261,13 +359,6 @@
         <span class="mt-1">Loop</span>
       </v-card>
     </v-card>
-
-    <!-- <v-divider v-if="!$store.state.tweaks.roundTweak" />
-
-    <h3 class="ml-8 mt-8">
-      <v-icon class="mb-1 mr-1">mdi-youtube</v-icon>
-      Quality
-    </h3> -->
   </div>
 </template>
 
diff --git a/NUXT/pages/mods/tweaks.vue b/NUXT/pages/mods/tweaks.vue
index fba7123..92c651e 100644
--- a/NUXT/pages/mods/tweaks.vue
+++ b/NUXT/pages/mods/tweaks.vue
@@ -4,7 +4,7 @@
     <!-- // TODO: Dense Navbar -->
     <!-- // TODO: Disable Top Bar -->
     <!-- // TODO: Top and Bottom bar color selection -->
-    <v-card
+    <!-- <v-card
       flat
       class="mx-4 my-2 px-4 py-2 d-flex flex-row background"
       style="transition-duration: 0.3s; transition-property: border-radius"
@@ -29,11 +29,11 @@
         persistent-hint
         inset
       />
-    </v-card>
+    </v-card> -->
 
-    <v-divider v-if="!roundTweak" />
+    <!-- <v-divider v-if="!roundTweak" /> -->
 
-    <v-card
+    <!-- <v-card
       flat
       class="mx-4 my-2 px-4 py-2 d-flex flex-row background"
       style="transition-duration: 0.3s; transition-property: border-radius"
@@ -58,7 +58,7 @@
         persistent-hint
         inset
       />
-    </v-card>
+    </v-card> -->
 
     <v-divider v-if="!roundTweak" />
 
@@ -66,7 +66,7 @@
 
     <v-card
       flat
-      class="mx-4 my-2 background"
+      class="mx-4 mt-2 mb-6 background"
       style="
         transition-duration: 0.3s;
         transition-property: border-radius;
diff --git a/NUXT/pages/watch.vue b/NUXT/pages/watch.vue
index b688faa..5b82f8d 100644
--- a/NUXT/pages/watch.vue
+++ b/NUXT/pages/watch.vue
@@ -53,7 +53,7 @@
           <v-icon v-else class="ml-4">mdi-chevron-down</v-icon>
         </div>
         <div
-          class="d-flex justify-space-between"
+          class="d-flex justify-space-around"
           :class="
             $store.state.tweaks.roundWatch && $store.state.tweaks.roundTweak > 0
               ? $vuetify.theme.dark