diff --git a/src/components/Game/GameNotesModal.vue b/src/components/Game/GameNotesModal.vue
new file mode 100644
index 00000000..ed498ab0
--- /dev/null
+++ b/src/components/Game/GameNotesModal.vue
@@ -0,0 +1,146 @@
+<!-- TODO: translate -->
+
+<template lang="html">
+  <b-button
+    v-b-modal.notes
+    variant="warning"
+    v-b-tooltip.hover
+    title="Game notes"
+   >
+    <icon name="note" white />
+
+    <b-modal
+      id="notes"
+      :header-bg-variant="nightMode ? 'dark' : null"
+      :header-text-variant="nightMode ? 'white' : null"
+      :body-bg-variant="nightMode ? 'dark' : null"
+      :body-text-variant="nightMode ? 'white' : null"
+      :footer-bg-variant="nightMode ? 'dark' : null"
+      :footer-text-variant="nightMode ? 'white' : null"
+      footer-class="d-flex justify-content-between"
+      @show="show"
+    >
+      <template v-slot:modal-header="{ close }">
+        <modal-header
+          title="Game notes"
+          @close="close"
+        />
+      </template>
+
+      <b-form-textarea
+        v-model.trim="localNote"
+        placeholder="Type note here"
+        rows="3"
+        max-rows="20"
+      />
+
+      <b-form-text id="input-live-help">
+        <a href="https://www.markdownguide.org/cheat-sheet/" target="_blank">
+          Markdown supported
+        </a>
+      </b-form-text>
+
+      <template v-slot:modal-footer="{ cancel }">
+        <b-button
+          variant="danger"
+          :disabled="deleting || !notes[game.id]"
+          @click="deleteNote"
+        >
+          <b-spinner small v-if="deleting" />
+          <span v-else>{{ $t('global.delete') }}</span>
+        </b-button>
+
+        <div>
+          <b-button
+            variant="light"
+            class="mx-2"
+            :disabled="saving"
+            @click="cancel"
+          >
+            {{ $t('global.cancel') }}
+          </b-button>
+
+          <b-button
+            variant="primary"
+            :disabled="saving"
+            @click="saveNote"
+          >
+            <b-spinner small v-if="saving" />
+            <span v-else>{{ $t('global.save') }}</span>
+          </b-button>
+        </div>
+      </template>
+    </b-modal>
+  </b-button>
+</template>
+
+<script>
+import { mapState, mapGetters } from 'vuex';
+
+export default {
+  props: {
+    game: Object,
+  },
+
+  data() {
+    return {
+      localNote: '',
+      deleting: false,
+      saving: false,
+    };
+  },
+
+  computed: {
+    ...mapState(['notes']),
+    ...mapGetters(['nightMode']),
+  },
+
+  methods: {
+    show() {
+      this.deleting = false;
+      this.saving = false;
+
+      const { id } = this.game;
+
+      // TODO: use optional chaining
+      this.localNote = this.notes[id] && typeof this.notes[id] === 'object' && this.notes[id].text
+        ? this.notes[id].text
+        : JSON.parse(JSON.stringify(this.notes[id]));
+    },
+
+    async saveNote() {
+      this.saving = true;
+
+      this.$store.commit('SET_GAME_NOTE', {
+        note: this.localNote,
+        gameId: this.game.id,
+      });
+
+      await this.$store.dispatch('SAVE_NOTES')
+        .catch(() => {
+          this.saving = false;
+          this.$bvToast.toast('There was an error saving your note', { title: 'Error', variant: 'danger' });
+        });
+
+      this.$bvToast.toast('Note saved', { title: 'Success', variant: 'success' });
+
+      this.$bvModal.hide('notes');
+    },
+
+    async deleteNote() {
+      this.deleting = true;
+
+      this.$store.commit('REMOVE_GAME_NOTE', this.game.id);
+
+      await this.$store.dispatch('SAVE_NOTES_NO_MERGE')
+        .catch(() => {
+          this.deleting = false;
+          this.$bvToast.toast('There was an error deleting your note', { title: 'Error', variant: 'danger' });
+        });
+
+      this.$bvToast.toast('Note deleted', { title: 'Success', variant: 'success' });
+      this.$bvModal.hide('notes');
+    },
+  },
+};
+</script>
diff --git a/src/components/Game/GameNotesTab.vue b/src/components/Game/GameNotesTab.vue
deleted file mode 100644
index 12d3829f..00000000
--- a/src/components/Game/GameNotesTab.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template lang="html">
-  <b-alert
-    v-if="notes[game.id]"
-    variant="warning"
-    show
-    v-b-modal.notes
-    class="mt-3"
-  >
-    <vue-markdown :source="gameNotes" />
-  </b-alert>
-</template>
-
-<script>
-import { mapState } from 'vuex';
-import VueMarkdown from 'vue-markdown';
-
-export default {
-  components: {
-    VueMarkdown,
-  },
-
-  props: {
-    game: Object,
-  },
-
-  computed: {
-    ...mapState(['notes']),
-
-    gameNotes() {
-      return typeof this.notes[this.game.id] === 'object' && this.notes[this.game.id].text
-        ? this.notes[this.game.id].text
-        : this.notes[this.game.id];
-    },
-  },
-};
-</script>
diff --git a/src/components/Game/GameVideosTab.vue b/src/components/Game/GameVideos.vue
similarity index 100%
rename from src/components/Game/GameVideosTab.vue
rename to src/components/Game/GameVideos.vue
diff --git a/src/components/Game/GameWebsitesTab.vue b/src/components/Game/GameWebsites.vue
similarity index 100%
rename from src/components/Game/GameWebsitesTab.vue
rename to src/components/Game/GameWebsites.vue