diff --git a/client/src/components/global/Footer.vue b/client/src/components/global/Footer.vue
index 4bf616074..ec7d25ba6 100644
--- a/client/src/components/global/Footer.vue
+++ b/client/src/components/global/Footer.vue
@@ -15,18 +15,12 @@ ccarra1@asu.edu
           <b-link :to="solo" title="Solo Mode">Solo Mode</b-link>
         </li>
         <li>
-          <b-link
-            v-if="$tstore.state.isFreePlayEnabled"
-            :to="freePlayLobby"
-            title="Port of Mars Free Play"
+          <b-link v-if="isFreePlayEnabled" :to="freePlayLobby" title="Port of Mars Free Play"
             >Free Play</b-link
           >
         </li>
         <li>
-          <b-link
-            v-if="$tstore.state.isFreePlayEnabled"
-            :to="tournamentDashboard"
-            title="Join Mars Madness"
+          <b-link v-if="isTournamentEnabled" :to="tournamentDashboard" title="Join Mars Madness"
             >Join Mars Madness</b-link
           >
         </li>
@@ -132,6 +126,14 @@ export default class Footer extends Vue {
   get constants() {
     return Constants;
   }
+
+  get isTournamentEnabled() {
+    return this.$tstore.state.isTournamentEnabled;
+  }
+
+  get isFreePlayEnabled() {
+    return this.$tstore.state.isFreePlayEnabled;
+  }
 }
 </script>
 
diff --git a/client/src/components/global/Navbar.vue b/client/src/components/global/Navbar.vue
index 87221a47f..492a537f6 100644
--- a/client/src/components/global/Navbar.vue
+++ b/client/src/components/global/Navbar.vue
@@ -45,7 +45,7 @@
           Solo Mode
         </b-nav-item>
         <b-nav-item
-          v-if="$tstore.state.isFreePlayEnabled"
+          v-if="isFreePlayEnabled"
           class="mx-2 text-nowrap"
           :to="freePlayLobby"
           exact-active-class="active"
@@ -54,7 +54,7 @@
           Free Play
         </b-nav-item>
         <b-nav-item
-          v-if="$tstore.state.isTournamentEnabled"
+          v-if="isTournamentEnabled"
           class="mx-2 text-nowrap"
           link-classes="btn btn-success text-white"
           :to="tournamentDashboard"
@@ -147,7 +147,7 @@ export default class Navbar extends Vue {
 
   mounted() {
     console.log("route name: ", this.$route.name);
-    console.log("route.name = login", this.$route.name == this.login.name);
+    console.log("route.name = login ?", this.$route.name == this.login.name);
   }
 
   get constants() {
@@ -166,6 +166,14 @@ export default class Navbar extends Vue {
     return this.$tstore.getters.isAdmin;
   }
 
+  get isTournamentEnabled() {
+    return this.$tstore.state.isTournamentEnabled;
+  }
+
+  get isFreePlayEnabled() {
+    return this.$tstore.state.isFreePlayEnabled;
+  }
+
   get isInGame() {
     if (_.isNil(this.$route.name)) {
       return false;