diff --git a/Lieb/Pages/GuildWars2/BuildEdit.razor b/Lieb/Pages/GuildWars2/BuildEdit.razor
index 5014741..a74080e 100644
--- a/Lieb/Pages/GuildWars2/BuildEdit.razor
+++ b/Lieb/Pages/GuildWars2/BuildEdit.razor
@@ -13,7 +13,6 @@
 <AuthorizeView Policy="@Constants.Roles.Admin" Context="authorizationContext">
     <EditForm Model="@_build" OnValidSubmit="@HandleValidSubmit">
         <DataAnnotationsValidator />
-        <ValidationSummary />
     
         <p>
             <label>
@@ -69,7 +68,9 @@
                 </InputSelect>
             </label>
         </p>
-    <button type="submit">Submit</button>
+
+        <ValidationSummary />
+        <button type="submit">Submit</button>
 
     </EditForm>
         <br/>
diff --git a/Lieb/Pages/GuildWars2/BuildOverview.razor b/Lieb/Pages/GuildWars2/BuildOverview.razor
index 0004db8..a87b122 100644
--- a/Lieb/Pages/GuildWars2/BuildOverview.razor
+++ b/Lieb/Pages/GuildWars2/BuildOverview.razor
@@ -14,6 +14,17 @@
                 <span class="oi oi-plus" aria-hidden="true"></span> Add Build
             </NavLink>
         </div>
+            
+            <label>
+                Filter:
+                <select @onchange="args => ChangeFilter(args)" >
+                    <option value="All">All</option>
+                    @foreach(GuildWars2Class gw2Class in Enum.GetValues(typeof(GuildWars2Class)))
+                    {
+                        <option value="@gw2Class">@gw2Class.ToString()</option>
+                    }
+                </select>
+            </label>
 
          <table>
             <tr>
@@ -25,22 +36,21 @@
                 <th>Quick</th>
                 <th>Alac</th>
             </tr>
-
-        @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>
-                <td>@build.Class.ToString()</td>
-                <td>@build.EliteSpecialization.ToString()</td>
-                <td><input type="checkbox" checked="@(build.Might > 0)" disabled="disabled" /></td>
-                <td><input type="checkbox" checked="@(build.Heal > 0)" disabled="disabled" /></td>
-                <td><input type="checkbox" checked="@(build.Quickness > 0)" disabled="disabled" /></td>
-                <td><input type="checkbox" checked="@(build.Alacrity > 0)" disabled="disabled" /></td>
-            </tr>
-        }
+            @foreach (var build in _buildsToShow.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>
+                    <td>@build.Class.ToString()</td>
+                    <td>@build.EliteSpecialization.ToString()</td>
+                    <td><input type="checkbox" checked="@(build.Might > 0)" disabled="disabled" /></td>
+                    <td><input type="checkbox" checked="@(build.Heal > 0)" disabled="disabled" /></td>
+                    <td><input type="checkbox" checked="@(build.Quickness > 0)" disabled="disabled" /></td>
+                    <td><input type="checkbox" checked="@(build.Alacrity > 0)" disabled="disabled" /></td>
+                </tr>
+            }
         </table> 
 
     </Authorized>
@@ -49,9 +59,23 @@
 @code 
 {
     private List<GuildWars2Build> _builds;
+    private List<GuildWars2Build> _buildsToShow;
 
     protected override async Task OnInitializedAsync()
     {
         _builds = GuildWars2BuildService.GetBuilds();
+        _buildsToShow = _builds;
+    }
+
+    private void ChangeFilter( ChangeEventArgs e)
+    {
+        if(Enum.TryParse<GuildWars2Class>(e.Value?.ToString(),out GuildWars2Class selectedClass))
+        {
+            _buildsToShow = _builds.Where(b => b.Class == selectedClass).ToList();
+        }
+        else
+        {
+            _buildsToShow = _builds;
+        }
     }
 }
diff --git a/Lieb/Pages/User/ManageGuildWars2Account.razor b/Lieb/Pages/User/ManageGuildWars2Account.razor
index 18224ca..67462e6 100644
--- a/Lieb/Pages/User/ManageGuildWars2Account.razor
+++ b/Lieb/Pages/User/ManageGuildWars2Account.razor
@@ -42,6 +42,16 @@
         @if (_account.GuildWars2AccountId != 0)
         {
             <br />
+            <label>
+                Filter:
+                <select @onchange="args => ChangeBuildFilter(args)" >
+                    <option value="All">All</option>
+                    @foreach(GuildWars2Class gw2Class in Enum.GetValues(typeof(GuildWars2Class)))
+                    {
+                        <option value="@gw2Class">@gw2Class.ToString()</option>
+                    }
+                </select>
+            </label>
             <table>
                 <tr>
                     <th>Equipped</th>
@@ -54,7 +64,7 @@
                     <th>Quick</th>
                     <th>Alac</th>
                 </tr>
-                @foreach (GuildWars2Build build in GuildWars2BuildService.GetBuilds())
+                @foreach (GuildWars2Build build in _buildsToShow.OrderBy(b => b.Class).ThenBy(b => b.EliteSpecialization))
                 {
                     Equipped? equippedBuild = _account.EquippedBuilds.FirstOrDefault(e => e.GuildWars2BuildId == build.GuildWars2BuildId);
                     bool isEquipped = equippedBuild != null;
@@ -97,6 +107,10 @@
 
     private string _saveMessage = string.Empty;
 
+    private List<GuildWars2Build> _builds;
+
+    private List<GuildWars2Build> _buildsToShow;
+
     protected override async Task OnInitializedAsync()
     {
         var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
@@ -111,6 +125,8 @@
         {
             _account = new GuildWars2Account();
         }
+        _builds = GuildWars2BuildService.GetBuilds();
+        _buildsToShow = _builds;
     }
 
     async Task EquippedStatusChanged(int buildId, ChangeEventArgs args)
@@ -149,4 +165,16 @@
         _account = GuildWars2AccountService.GetAccount(_account.GuildWars2AccountId);
         _saveMessage = "changes saved successfully";
     }
+
+    private void ChangeBuildFilter( ChangeEventArgs e)
+    {
+        if(Enum.TryParse<GuildWars2Class>(e.Value?.ToString(),out GuildWars2Class selectedClass))
+        {
+            _buildsToShow = _builds.Where(b => b.Class == selectedClass).ToList();
+        }
+        else
+        {
+            _buildsToShow = _builds;
+        }
+    }
 }
\ No newline at end of file