diff --git a/docs/.vuepress/theme/components/NavDrawer.vue b/docs/.vuepress/theme/components/NavDrawer.vue
index 6cfa6ba..8227a1a 100644
--- a/docs/.vuepress/theme/components/NavDrawer.vue
+++ b/docs/.vuepress/theme/components/NavDrawer.vue
@@ -41,7 +41,7 @@
                     </v-list-item-title>
                   </v-list-item-content>
                 </template>
-                <v-list-item v-for="subchild in child.children" link :to="{path: subchild.path}" exact>
+                <v-list-item v-for="subchild in child.children" link :to="{path: subchild.path}" >
                   <v-list-item-icon v-if="subchild.icon">
                     <v-icon v-text="subchild.icon"></v-icon>
                   </v-list-item-icon>
@@ -54,7 +54,7 @@
                 </v-list-item>
               </v-list-group>
               <v-divider v-else-if="child.type == 'divider'" />
-              <v-list-item v-else :key="child.title" link :to="{path: child.path}" exact>
+              <v-list-item v-else :key="child.title" link :to="{path: child.path}" >
                 <v-list-item-icon v-if="child.icon">
                   <v-icon v-text="child.icon"></v-icon>
                 </v-list-item-icon>
@@ -68,7 +68,7 @@
             </template>
           </v-list-group>
           <v-divider v-else-if="item.type == 'divider'" />
-          <v-list-item v-else :key="item.title" link :to="{path: item.path}" color="accent" exact>
+          <v-list-item v-else :key="item.title" link :to="{path: item.path}" color="accent" >
             <v-list-item-icon v-if="item.icon">
               <v-icon v-text="item.icon"></v-icon>
             </v-list-item-icon>
diff --git a/docs/.vuepress/theme/layouts/MagicItemsLayout.vue b/docs/.vuepress/theme/layouts/MagicItemsLayout.vue
index 1c867b6..e8fd9c7 100644
--- a/docs/.vuepress/theme/layouts/MagicItemsLayout.vue
+++ b/docs/.vuepress/theme/layouts/MagicItemsLayout.vue
@@ -197,6 +197,15 @@ export default {
     }
   },
 
+  watch: {
+    magicItems: function (newMagicItems, oldMagicItems) {
+      let self = this
+      setTimeout(function () {
+        handleTooltips({pages:self.$site.pages})
+      }, 100);
+    }
+  },
+
   methods: {
     isItemInTreasureChest (magicItem) {
       return isResourceInLibrary(magicItem, this.$store.state.myMagicItems.magicItems)
@@ -219,11 +228,6 @@ export default {
       setTimeout(function () {
         handleTooltips({pages:self.$site.pages})
       }, 100);
-      this.$router.afterEach(() => {
-        setTimeout(function () {
-          handleTooltips({pages:self.$site.pages})
-        }, 100)
-      })
     },
 
     changePage (page) {
@@ -233,11 +237,6 @@ export default {
       setTimeout(function () {
         handleTooltips({pages:self.$site.pages})
       }, 100);
-      this.$router.afterEach(() => {
-        setTimeout(function () {
-          handleTooltips({pages:self.$site.pages})
-        }, 100)
-      })
     },
 
     onClickRow (row, item) {
diff --git a/docs/.vuepress/theme/layouts/MonstersLayout.vue b/docs/.vuepress/theme/layouts/MonstersLayout.vue
index c42b5cd..8a7123b 100644
--- a/docs/.vuepress/theme/layouts/MonstersLayout.vue
+++ b/docs/.vuepress/theme/layouts/MonstersLayout.vue
@@ -386,11 +386,6 @@ export default {
       setTimeout(function () {
         handleTooltips({pages:self.$site.pages})
       }, 100);
-      this.$router.afterEach(() => {
-        setTimeout(function () {
-          handleTooltips({pages:self.$site.pages})
-        }, 100)
-      })
     },
 
     changePage (page) {
@@ -400,11 +395,6 @@ export default {
       setTimeout(function () {
         handleTooltips({pages:self.$site.pages})
       }, 100);
-      this.$router.afterEach(() => {
-        setTimeout(function () {
-          handleTooltips({pages:self.$site.pages})
-        }, 100)
-      })
     },
 
     onClickRow (row, item) {
@@ -416,6 +406,15 @@ export default {
     },
   },
 
+  watch: {
+    monsters: function (newMonsters, oldMonsters) {
+      let self = this
+      setTimeout(function () {
+        handleTooltips({pages:self.$site.pages})
+      }, 100);
+    }
+  },
+
   mounted () {
     this.$store.commit('setHasRightDrawer', true)
     this.$store.commit('setRightDrawer', this.$vuetify.breakpoint.lgAndUp)
diff --git a/docs/.vuepress/theme/layouts/SpellsLayout.vue b/docs/.vuepress/theme/layouts/SpellsLayout.vue
index ca8d3d7..489666a 100644
--- a/docs/.vuepress/theme/layouts/SpellsLayout.vue
+++ b/docs/.vuepress/theme/layouts/SpellsLayout.vue
@@ -362,6 +362,15 @@ export default {
     }
   },
 
+  watch: {
+    spells: function (newSpells, oldSpells) {
+      let self = this
+      setTimeout(function () {
+        handleTooltips({pages:self.$site.pages})
+      }, 100);
+    }
+  },
+
   methods: {
     isSpellInSpellBook (spell) {
       return isResourceInLibrary(spell, this.$store.state.mySpells.spells)
@@ -384,11 +393,6 @@ export default {
       setTimeout(function () {
         handleTooltips({pages:self.$site.pages})
       }, 100);
-      this.$router.afterEach(() => {
-        setTimeout(function () {
-          handleTooltips({pages:self.$site.pages})
-        }, 100)
-      })
     },
 
     changePage (page) {
@@ -398,11 +402,6 @@ export default {
       setTimeout(function () {
         handleTooltips({pages:self.$site.pages})
       }, 100);
-      this.$router.afterEach(() => {
-        setTimeout(function () {
-          handleTooltips({pages:self.$site.pages})
-        }, 100)
-      })
     },
 
     onClickRow (row, item) {