diff --git a/src/app.js b/src/app.js
index 1ed42975..a4cccf13 100644
--- a/src/app.js
+++ b/src/app.js
@@ -13664,15 +13664,15 @@ console.log(`isLinux: ${LINUX}`);
             menuActiveIndex: this.menuActiveIndex,
             gameLogTable: this.gameLogTable,
             shiftHeld: this.shiftHeld,
-            hideTooltips: this.hideTooltips
+            hideTooltips: this.hideTooltips,
+            gameLogIsFriend: this.gameLogIsFriend,
+            gameLogIsFavorite: this.gameLogIsFavorite
         };
     };
 
     $app.computed.gameLogTabEvent = function () {
         return {
             gameLogTableLookup: this.gameLogTableLookup,
-            gameLogIsFriend: this.gameLogIsFriend,
-            gameLogIsFavorite: this.gameLogIsFavorite,
             lookupUser: this.lookupUser,
             updateGameLogSessionTable: (val) =>
                 (this.gameLogSessionTable = val),
diff --git a/src/components/dialogs/ChooseFavoriteGroupDialog.vue b/src/components/dialogs/ChooseFavoriteGroupDialog.vue
index 8fe55715..dd15fdec 100644
--- a/src/components/dialogs/ChooseFavoriteGroupDialog.vue
+++ b/src/components/dialogs/ChooseFavoriteGroupDialog.vue
@@ -167,16 +167,16 @@
                     });
             },
             addLocalWorldFavorite(...args) {
-                this.$emit('add-local-world-favorite', ...args);
+                this.$emit('addLocalWorldFavorite', ...args);
             },
             removeLocalWorldFavorite(...args) {
-                this.$emit('remove-local-world-favorite', ...args);
+                this.$emit('removeLocalWorldFavorite', ...args);
             },
             addLocalAvatarFavorite(...args) {
-                this.$emit('add-local-avatar-favorite', ...args);
+                this.$emit('addLocalAvatarFavorite', ...args);
             },
             removeLocalAvatarFavorite(...args) {
-                this.$emit('remove-local-avatar-favorite', ...args);
+                this.$emit('removeLocalAvatarFavorite', ...args);
             },
             deleteFavoriteNoConfirm(...args) {
                 this.$emit('deleteFavoriteNoConfirm', ...args);
diff --git a/src/views/FriendLog/FriendLog.vue b/src/views/FriendLog/FriendLog.vue
index 7110e08b..516e7abf 100644
--- a/src/views/FriendLog/FriendLog.vue
+++ b/src/views/FriendLog/FriendLog.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-if="menuActiveIndex === 'friendLog'" class="x-container">
+    <div v-show="menuActiveIndex === 'friendLog'" class="x-container">
         <data-tables v-bind="friendLogTable">
             <template #tool>
                 <div style="margin: 0 0 10px; display: flex; align-items: center">
diff --git a/src/views/GameLog/GameLog.vue b/src/views/GameLog/GameLog.vue
index 0081e5f0..863dfd89 100644
--- a/src/views/GameLog/GameLog.vue
+++ b/src/views/GameLog/GameLog.vue
@@ -225,6 +225,14 @@
         shiftHeld: {
             type: Boolean,
             default: false
+        },
+        gameLogIsFriend: {
+            type: Function,
+            default: () => () => false
+        },
+        gameLogIsFavorite: {
+            type: Function,
+            default: () => () => false
         }
     });
 
@@ -241,14 +249,6 @@
         emit('gameLogTableLookup');
     }
 
-    function gameLogIsFriend(row) {
-        emit('gameLogIsFriend', row);
-    }
-
-    function gameLogIsFavorite(row) {
-        emit('gameLogIsFavorite', row);
-    }
-
     function lookupUser(ref) {
         emit('lookupUser', ref);
     }
diff --git a/src/views/Moderation/Moderation.vue b/src/views/Moderation/Moderation.vue
index 34492522..b370e270 100644
--- a/src/views/Moderation/Moderation.vue
+++ b/src/views/Moderation/Moderation.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="x-container" v-if="menuActiveIndex === 'moderation'">
+    <div v-show="menuActiveIndex === 'moderation'" class="x-container">
         <data-tables
             :data="tableData.data"
             :pageSize="tableData.pageSize"
diff --git a/src/views/Notifications/Notification.vue b/src/views/Notifications/Notification.vue
index c1ef35c3..855cf6c1 100644
--- a/src/views/Notifications/Notification.vue
+++ b/src/views/Notifications/Notification.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-if="menuActiveIndex === 'notification'" v-loading="API.isNotificationsLoading" class="x-container">
+    <div v-show="menuActiveIndex === 'notification'" v-loading="API.isNotificationsLoading" class="x-container">
         <data-tables v-bind="notificationTable" ref="notificationTableRef" class="notification-table">
             <template #tool>
                 <div style="margin: 0 0 10px; display: flex; align-items: center">
diff --git a/src/views/PlayerList/PlayerList.vue b/src/views/PlayerList/PlayerList.vue
index c59dc724..e59a4e2c 100644
--- a/src/views/PlayerList/PlayerList.vue
+++ b/src/views/PlayerList/PlayerList.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-if="menuActiveIndex === 'playerList'" class="x-container" style="padding-top: 5px">
+    <div v-show="menuActiveIndex === 'playerList'" class="x-container" style="padding-top: 5px">
         <div style="display: flex; flex-direction: column; height: 100%">
             <div v-if="currentInstanceWorld.ref.id" style="display: flex">
                 <el-popover placement="right" width="500px" trigger="click" style="height: 120px">
@@ -776,8 +776,8 @@
                         <template #default="scope">
                             <span
                                 class="name"
-                                :class="scope.row.ref.trustClass"
-                                v-text="scope.row.ref.trustLevel"></span>
+                                :class="scope.row.ref.$trustClass"
+                                v-text="scope.row.ref.$trustLevel"></span>
                         </template>
                     </el-table-column>
                     <el-table-column :label="t('table.playerList.language')" width="100" prop="ref.$languages">
@@ -875,7 +875,7 @@
         },
         photonEventTableTypeFilter: {
             type: Array,
-            default: []
+            default: () => []
         },
         photonEventTableTypeFilterList: {
             type: Array,
diff --git a/src/views/Search/Search.vue b/src/views/Search/Search.vue
index 4c4c7ce7..4052f3a9 100644
--- a/src/views/Search/Search.vue
+++ b/src/views/Search/Search.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-if="menuActiveIndex === 'search'" class="x-container">
+    <div v-show="menuActiveIndex === 'search'" class="x-container">
         <div style="margin: 0 0 10px; display: flex; align-items: center">
             <el-input
                 :value="searchText"