diff --git a/Lieb/Pages/GuildWars2/BuildEdit.razor b/Lieb/Pages/GuildWars2/BuildEdit.razor
index 77c2301..df50180 100644
--- a/Lieb/Pages/GuildWars2/BuildEdit.razor
+++ b/Lieb/Pages/GuildWars2/BuildEdit.razor
@@ -10,7 +10,7 @@
 
 <h3>BuildEdit</h3>
 
-<AuthorizeView Policy="Admin" Context="authorizationContext">
+<AuthorizeView Policy="@Constants.Roles.Admin" Context="authorizationContext">
     <EditForm Model="@_build" OnValidSubmit="@HandleValidSubmit">
         <DataAnnotationsValidator />
         <ValidationSummary />
diff --git a/Lieb/Pages/GuildWars2/BuildOverview.razor b/Lieb/Pages/GuildWars2/BuildOverview.razor
index 9b33c79..a935c5a 100644
--- a/Lieb/Pages/GuildWars2/BuildOverview.razor
+++ b/Lieb/Pages/GuildWars2/BuildOverview.razor
@@ -7,53 +7,44 @@
 <h3>BuildOverview</h3>
 
 
-<AuthorizeView Policy="Admin">
+<AuthorizeView Policy="@Constants.Roles.Admin">
     <Authorized>
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="buildedit">
                 <span class="oi oi-plus" aria-hidden="true"></span> Add Build
             </NavLink>
         </div>
-    </Authorized>
-</AuthorizeView>
 
+         <table>
+            <tr>
+                <th>Name</th>
+                <th>Class</th>
+                <th>Elite</th>
+                <th>Might</th>
+                <th>Heal</th>
+                <th>Quick</th>
+                <th>Alac</th>
+            </tr>
 
- <table>
-    <tr>
-        <th>Name</th>
-        <th>Class</th>
-        <th>Elite</th>
-        <th>Might</th>
-        <th>Heal</th>
-        <th>Quick</th>
-        <th>Alac</th>
-    </tr>
-
-
-@foreach (var build in _builds.OrderBy(b => b.Class).ThenBy(b => b.EliteSpecialization))
-{
-    <tr>    
-        <AuthorizeView Policy="Admin">
-            <Authorized>
+        @foreach (var build in _builds.OrderBy(b => b.Class).ThenBy(b => b.EliteSpecialization))
+        {
+            <tr>    
                 <td class="nav-item px-3">
                     @{string navLink = $"buildedit/{@build.GuildWars2BuildId}";}
                     <NavLink class="nav-link" href="@navLink">@build.BuildName</NavLink>
                 </td>
-            </Authorized>
-            <NotAuthorized>
-                <td>   @build.BuildName</td>
-            </NotAuthorized>
-        </AuthorizeView>
-        <td>@build.Class.ToString()</td>
-        <td>@build.EliteSpecialization.ToString()</td>
-        <td>@build.Might.ToString()</td>
-        <td>@build.Heal.ToString()</td>
-        <td>@build.Quickness.ToString()</td>
-        <td>@build.Alacrity.ToString()</td>
-    </tr>
-}
-</table> 
+                <td>@build.Class.ToString()</td>
+                <td>@build.EliteSpecialization.ToString()</td>
+                <td>@build.Might.ToString()</td>
+                <td>@build.Heal.ToString()</td>
+                <td>@build.Quickness.ToString()</td>
+                <td>@build.Alacrity.ToString()</td>
+            </tr>
+        }
+        </table> 
 
+    </Authorized>
+</AuthorizeView>
 
 @code 
 {
diff --git a/Lieb/Pages/Raids/RaidDetails.razor b/Lieb/Pages/Raids/RaidDetails.razor
index 3451775..f900b7a 100644
--- a/Lieb/Pages/Raids/RaidDetails.razor
+++ b/Lieb/Pages/Raids/RaidDetails.razor
@@ -137,7 +137,7 @@
         </div>
     </NotAuthorized>
 </AuthorizeView>
-<AuthorizeView Policy="RaidLead">
+<AuthorizeView Policy="@Constants.Roles.RaidLead">
     <div class="nav-item px-3">
         @{string navLink = $"raidedit/{@Raid.RaidId}";}
         <NavLink class="nav-link" href="@navLink">
diff --git a/Lieb/Pages/Raids/RaidEdit.razor b/Lieb/Pages/Raids/RaidEdit.razor
index 264be1f..98d45ac 100644
--- a/Lieb/Pages/Raids/RaidEdit.razor
+++ b/Lieb/Pages/Raids/RaidEdit.razor
@@ -10,7 +10,7 @@
 
 <h3>CreateRaid</h3>
 
-<AuthorizeView Policy="RaidLead" Context="authorizationContext">
+<AuthorizeView Policy="@Constants.Roles.RaidLead" Context="authorizationContext">
 <EditForm Model="@_raid" OnValidSubmit="@HandleValidSubmit">
     <DataAnnotationsValidator />
     <ValidationSummary />
diff --git a/Lieb/Pages/Raids/RaidOverview.razor b/Lieb/Pages/Raids/RaidOverview.razor
index 3aa48c5..ef84a45 100644
--- a/Lieb/Pages/Raids/RaidOverview.razor
+++ b/Lieb/Pages/Raids/RaidOverview.razor
@@ -6,7 +6,7 @@
 <h3>RaidOverview</h3>
 
 
-<AuthorizeView Policy="RaidLead">
+<AuthorizeView Policy="@Constants.Roles.RaidLead">
         <div class="nav-item px-3">
             <NavLink class="nav-link" href="raidedit">
                 <span class="oi oi-plus" aria-hidden="true"></span> Add Raid
diff --git a/Lieb/Shared/NavMenu.razor b/Lieb/Shared/NavMenu.razor
index db34bb5..c8c60a7 100644
--- a/Lieb/Shared/NavMenu.razor
+++ b/Lieb/Shared/NavMenu.razor
@@ -1,4 +1,5 @@
-<div class="top-row ps-3 navbar navbar-dark">
+@using Lieb.Data
+<div class="top-row ps-3 navbar navbar-dark">
     <div class="container-fluid">
         <a class="navbar-brand" href="">Lieb</a>
         <button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
@@ -19,16 +20,24 @@
                 <span class="oi oi-plus" aria-hidden="true"></span> Raid Overview
             </NavLink>
         </div>
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="buildoverview">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Build Overview
-            </NavLink>
-        </div>
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="accountedit">
-                <span class="oi oi-list-rich" aria-hidden="true"></span> Account
-            </NavLink>
-        </div>
+        <AuthorizeView Policy="@Constants.Roles.Admin">
+            <Authorized>
+                <div class="nav-item px-3">
+                    <NavLink class="nav-link" href="buildoverview">
+                        <span class="oi oi-list-rich" aria-hidden="true"></span> Build Overview
+                    </NavLink>
+                </div>
+            </Authorized>
+        </AuthorizeView>
+        <AuthorizeView>
+            <Authorized>
+                <div class="nav-item px-3">
+                    <NavLink class="nav-link" href="accountedit">
+                        <span class="oi oi-list-rich" aria-hidden="true"></span> Account
+                    </NavLink>
+                </div>
+            </Authorized>
+        </AuthorizeView>
     </nav>
 </div>