diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index d8ddccebbe134ea7bb6eb00c547b94762b06ff33..bb162c6ae048577461166b69a926245f79047ea8 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -1,13 +1,5 @@
 <template>
   <div class="lb-nav">
-    <v-alert dismissible color="tertiary" class="mb-0" close-icon="mdi-close">
-      The Launchboard Team Management feature will be replaced by Keycloak
-      groups in the near future. At the time, membership will no longer be set
-      inside Launchboard. You may continue to use the Launchboard Team
-      Management feature for now and consider it a beta feature, but those
-      setting will be overridden by Keyclaok once it is used at the source of
-      truth for Teams in Launchboard.
-    </v-alert>
     <v-app-bar
       id="app-bar"
       flat
@@ -15,67 +7,60 @@
       height="102"
       class="px-4 px-lg-12 px-xl-16"
     >
-      <v-row>
-        <v-toolbar-title>
-          <router-link to="/" class="d-flex">
-            <v-img
-              v-if="darkMode"
-              contain
-              src="@/assets/images/logos/LB-Logo_Horizontal_White-PNG.png"
-              class="logo"
-            />
-            <v-img
-              v-else
-              contain
-              src="@/assets/images/logos/LB-Logo_Horizontal_BLUE-PNG.png"
-              class="logo"
-            />
+      <v-toolbar-title>
+        <router-link to="/" class="d-flex">
+          <v-img
+            v-if="darkMode"
+            contain
+            src="@/assets/images/logos/LB-Logo_Horizontal_White-PNG.png"
+            class="logo"
+          />
+          <v-img
+            v-else
+            contain
+            src="@/assets/images/logos/LB-Logo_Horizontal_BLUE-PNG.png"
+            class="logo"
+          />
+        </router-link>
+      </v-toolbar-title>
+      <v-spacer></v-spacer>
+      <v-toolbar-items class="hidden-sm-and-down">
+        <div class="navbar-nav my-auto">
+          <TutorialTooltip tooltipName="navBar">
+            <span id="navBarTutorialTooltip"></span>
+          </TutorialTooltip>
+          <router-link
+            class="nav-item text-uppercase"
+            v-for="(navItem, index) in navItems"
+            :key="index"
+            :to="navItem.to"
+            :exact="navItem.exact"
+          >
+            <span>{{ navItem.name }}</span>
           </router-link>
-        </v-toolbar-title>
-        <v-spacer></v-spacer>
-        <v-toolbar-items class="hidden-sm-and-down">
-          <div class="navbar-nav my-auto">
-            <TutorialTooltip tooltipName="navBar">
-              <span id="navBarTutorialTooltip"></span>
-            </TutorialTooltip>
-            <router-link
-              class="nav-item text-uppercase"
-              v-for="(navItem, index) in navItems"
-              :key="index"
-              :to="navItem.to"
-              :exact="navItem.exact"
-            >
-              <span>{{ navItem.name }}</span>
-            </router-link>
-          </div>
-        </v-toolbar-items>
-        <v-btn
-          icon
-          class="no-link nav-item"
-          id="settings-button"
-          to="/settings"
-        >
-          <v-icon>mdi-cog</v-icon>
-        </v-btn>
-        <v-app-bar-nav-icon
-          id="nav-toggle"
-          @click.stop="menuVisible = !menuVisible"
+        </div>
+      </v-toolbar-items>
+      <v-btn icon class="no-link nav-item" id="settings-button" to="/settings">
+        <v-icon>mdi-cog</v-icon>
+      </v-btn>
+      <v-app-bar-nav-icon
+        id="nav-toggle"
+        @click.stop="menuVisible = !menuVisible"
+        class="hidden-md-and-up mr-0"
+      >
+        <Burger :open="menuVisible" />
+      </v-app-bar-nav-icon>
+      <TutorialTooltip
+        tooltipName="navBar"
+        nudgeLeft="400"
+        :arrowRightSide="true"
+        :displayMobileOnly="true"
+      >
+        <span
+          id="navBarMobileTutorialTooltip"
           class="hidden-md-and-up mr-0"
-        >
-          <Burger :open="menuVisible" />
-        </v-app-bar-nav-icon>
-        <TutorialTooltip
-          tooltipName="navBar"
-          nudgeLeft="400"
-          :arrowRightSide="true"
-          :displayMobileOnly="true"
-        >
-          <span
-            id="navBarMobileTutorialTooltip"
-            class="hidden-md-and-up mr-0"
-          ></span>
-        </TutorialTooltip>
-      </v-row>
+        ></span>
+      </TutorialTooltip>
     </v-app-bar>
     <v-navigation-drawer
       v-model="menuVisible"
@@ -100,6 +85,21 @@
         </router-link>
       </div>
     </v-navigation-drawer>
+    <v-alert
+      dark
+      v-model="betaMessage"
+      dismissible
+      class="mb-0"
+      close-icon="mdi-close"
+      color="#15283A"
+    >
+      The Launchboard Team Management feature will be replaced by Keycloak
+      groups in the near future. At the time, membership will no longer be set
+      inside Launchboard. You may continue to use the Launchboard Team
+      Management feature for now and consider it a beta feature, but those
+      setting will be overridden by Keyclaok once it is used at the source of
+      truth for Teams in Launchboard.
+    </v-alert>
   </div>
 </template>
 <script>