diff --git a/Components/Display/InfoTooltipComponent.razor b/Components/Display/InfoTooltipComponent.razor
index 04bbc83..d5b7110 100644
--- a/Components/Display/InfoTooltipComponent.razor
+++ b/Components/Display/InfoTooltipComponent.razor
@@ -10,8 +10,6 @@
         position: relative;
         display: inline-block;
         width: 100%;
-        
-        
     }
 
     .tooltipContent {
@@ -25,17 +23,19 @@
         
         margin-left: -60px;
         margin-bottom: 36px;
-        background-color: #363636;
-        color: #fff;
-        border-radius: 6px;
 
         padding-left: 20px;
         padding-right: 20px;
         padding-bottom: 20px;
         padding-top: 20px;
-        border: 2px solid black;
         white-space: break-spaces;
         z-index: 2147483647;
+        
+        background-color: var(--info-secondary);
+        border:  1px solid var(--info-secondary-border);
+        border-radius: 2px;
+        
+        box-shadow: 0 3px 8px rgba(0,0,0,0.5);
     }
 
 
diff --git a/Components/Feedback/ToastComponent.razor b/Components/Feedback/ToastComponent.razor
index d90ce3a..dbeb029 100644
--- a/Components/Feedback/ToastComponent.razor
+++ b/Components/Feedback/ToastComponent.razor
@@ -9,10 +9,10 @@
 }
 else
 {
-    <div class="toastContainer @Toast.SeverityType.ToLower() @FadeoutStyle">
-            <div class="toastTitle">
-                @Toast.Title
-            </div>
+    <div onclick="@Dismiss" class="toastContainer @FadeoutStyle @Toast.SeverityType.ToLower()">
+        <div class="toastTitle">
+            @Toast.Title
+        </div>
             <div>
                 @Toast.Message
             </div>
@@ -27,9 +27,9 @@ else
         display: flex;
         flex-direction: column;
         justify-items: stretch;
-        width: 100%;
-        
+        width: 250px;
         opacity: 1;
+        cursor: pointer;
     }
     
     .fadeout {
@@ -37,22 +37,22 @@ else
         opacity: 0;
     }
 
-    .toastContainer.@SeverityType.Warning.ToLower() {
+    .@SeverityType.Warning.ToLower() {
         background-color: var(--severity-warning-color);
         border-color: var(--severity-warning-border-color);
     }
 
-    .toastContainer.@SeverityType.Error.ToLower() {
+    .@SeverityType.Error.ToLower() {
         background-color: var(--severity-error-color);
         border-color: var(--severity-error-border-color);
     }
 
-    .toastContainer.@SeverityType.Information.ToLower() {
+    .@SeverityType.Information.ToLower() {
         background-color: var(--severity-information-color);
         border-color: var(--severity-information-border-color);
     }
 
-    .toastContainer.@SeverityType.Success.ToLower() {
+    .@SeverityType.Success.ToLower() {
         background-color: var(--severity-success-color);
         border-color: var(--severity-success-border-color);
     }
@@ -64,6 +64,7 @@ else
 </style>
 
 @code {
+        
     [Parameter]
     public ToastModel? Toast { get; set; } = default!;
 
@@ -72,9 +73,7 @@ else
     private string FadeoutStyle => isFadingOut ? "fadeout" : "";
 
     private int removalTime = 150000;
-    private int fadeoutTime = 4000;
-    
-    //private int fade
+    private int fadeoutTime = 1000;
 
     private Timer removalTimer = null!;
     private Timer fadeoutTimer = null!;
@@ -82,7 +81,7 @@ else
     protected override void OnInitialized()
     {
 #if DEBUG
-        removalTime = 5000;
+        removalTime = 8000;
 #endif
 
         removalTimer = new Timer(removalTime);
@@ -92,23 +91,34 @@ else
         fadeoutTimer = new Timer(removalTime - fadeoutTime);
         fadeoutTimer.Elapsed += OnFadeout!;
         fadeoutTimer.Enabled = true;
+        
+        toastService.Subscribe(StateHasChanged);
     }
 
     void OnFadeout(object source, ElapsedEventArgs eventArgs)
     {
-        isFadingOut = true;
+     //   isFadingOut = true;
         
         StateHasChanged();
     }
     
     void OnRemoval(object source, ElapsedEventArgs eventArgs)
+    {
+        //toastService.RemoveToast(Toast!);
+        
+        StateHasChanged();
+    }
+
+    void Dismiss()
     {
         toastService.RemoveToast(Toast!);
     }
 
     public void Dispose()
     {
-        removalTimer.Dispose();
-        fadeoutTimer.Dispose();
+        removalTimer.Elapsed -= OnRemoval!;
+        fadeoutTimer.Elapsed -= OnFadeout!;
+        
+        toastService.Unsubscribe(StateHasChanged);
     }
 }
\ No newline at end of file
diff --git a/Contexts/DatabaseContext.cs b/Contexts/DatabaseContext.cs
index 2e698d4..3897193 100644
--- a/Contexts/DatabaseContext.cs
+++ b/Contexts/DatabaseContext.cs
@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore;
 using Model.Doc;
 using Model.Notes;
 using Model.Website;
-using Model.Development.Git;
+using Model.Git;
 using Model.Work.Tasks;
 
 namespace Contexts;
diff --git a/IGP/Database.db b/IGP/Database.db
index 3d496a5..044f344 100644
Binary files a/IGP/Database.db and b/IGP/Database.db differ
diff --git a/IGP/IGP.csproj b/IGP/IGP.csproj
index eb15255..7b94b33 100644
--- a/IGP/IGP.csproj
+++ b/IGP/IGP.csproj
@@ -20,10 +20,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Markdig" Version="0.28.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0-preview.2.22153.2" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0-preview.2.22153.2" PrivateAssets="all" />
-        <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.0-preview.2.22153.2" />
+        <PackageReference Include="Markdig" Version="0.28.1"/>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0-preview.2.22153.2"/>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0-preview.2.22153.2" PrivateAssets="all"/>
+        <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.0-preview.2.22153.2"/>
         <!--
                 <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-preview.2.22153.1" />
                 <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.0-preview.2.22153.1" />
@@ -32,33 +32,33 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
+        <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Components\Components.csproj" />
-        <ProjectReference Include="..\Contexts\Contexts.csproj" />
-        <ProjectReference Include="..\Model\Model.csproj" />
-        <ProjectReference Include="..\Services\Services.csproj" />
+        <ProjectReference Include="..\Components\Components.csproj"/>
+        <ProjectReference Include="..\Contexts\Contexts.csproj"/>
+        <ProjectReference Include="..\Model\Model.csproj"/>
+        <ProjectReference Include="..\Services\Services.csproj"/>
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="wwwroot\generated" />
+        <Folder Include="wwwroot\generated"/>
     </ItemGroup>
 
     <ItemGroup>
-      <EmbeddedResource Update="Localizations.resx">
-        <Generator>ResXFileCodeGenerator</Generator>
-        <LastGenOutput>Localizations.Designer.cs</LastGenOutput>
-      </EmbeddedResource>
+        <EmbeddedResource Update="Localizations.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Localizations.Designer.cs</LastGenOutput>
+        </EmbeddedResource>
     </ItemGroup>
 
     <ItemGroup>
-      <Compile Update="Localizations.Designer.cs">
-        <DesignTime>True</DesignTime>
-        <AutoGen>True</AutoGen>
-        <DependentUpon>Example.resx</DependentUpon>
-      </Compile>
+        <Compile Update="Localizations.Designer.cs">
+            <DesignTime>True</DesignTime>
+            <AutoGen>True</AutoGen>
+            <DependentUpon>Example.resx</DependentUpon>
+        </Compile>
     </ItemGroup>
 
 </Project>
diff --git a/IGP/Index.razor b/IGP/Index.razor
index 72eb018..a70c3e5 100644
--- a/IGP/Index.razor
+++ b/IGP/Index.razor
@@ -4,17 +4,16 @@
 @layout PageLayout
 
 
-@inject IStringLocalizer<Localizations> Loc
+@inject IStringLocalizer<Localizations> locale
 
 <DevOnlyComponent>
     <DocumentationIndexPage></DocumentationIndexPage>
 
- @Loc["Greeting"].Value
-@Loc["Greeting"]
-@Loc["Greeting"].Name
-@Loc["Greeting"].ResourceNotFound
+    @locale["Greeting"].Value
+    @locale["Greeting"]
+    @locale["Greeting"].Name
+    @locale["Greeting"].ResourceNotFound
 </DevOnlyComponent>
 
 
-
 <HomePage></HomePage>
\ No newline at end of file
diff --git a/IGP/Localizations.Designer.cs b/IGP/Localizations.Designer.cs
index 1fd4b50..e12c540 100644
--- a/IGP/Localizations.Designer.cs
+++ b/IGP/Localizations.Designer.cs
@@ -50,5 +50,59 @@ namespace IGP {
                 return ResourceManager.GetString("Greeting", resourceCulture);
             }
         }
+        
+        internal static string Tooltip_Chart_Info {
+            get {
+                return ResourceManager.GetString("Tooltip Chart Info", resourceCulture);
+            }
+        }
+        
+        internal static string Tooltip_Filter_Info {
+            get {
+                return ResourceManager.GetString("Tooltip Filter Info", resourceCulture);
+            }
+        }
+        
+        internal static string Tooltip_Entity_Info {
+            get {
+                return ResourceManager.GetString("Tooltip Entity Info", resourceCulture);
+            }
+        }
+        
+        internal static string Tooltip_Bank_Info {
+            get {
+                return ResourceManager.GetString("Tooltip Bank Info", resourceCulture);
+            }
+        }
+        
+        internal static string Tooltip_Army_Info {
+            get {
+                return ResourceManager.GetString("Tooltip Army Info", resourceCulture);
+            }
+        }
+        
+        internal static string Tooltip_Highlights_Info {
+            get {
+                return ResourceManager.GetString("Tooltip Highlights Info", resourceCulture);
+            }
+        }
+        
+        internal static string Tooltip_BuildOrder_Info {
+            get {
+                return ResourceManager.GetString("Tooltip BuildOrder Info", resourceCulture);
+            }
+        }
+        
+        internal static string Tooltip_Timing_Info {
+            get {
+                return ResourceManager.GetString("Tooltip Timing Info", resourceCulture);
+            }
+        }
+        
+        internal static string Tooltip_Hotkey_Info {
+            get {
+                return ResourceManager.GetString("Tooltip Hotkey Info", resourceCulture);
+            }
+        }
     }
 }
diff --git a/IGP/Localizations.resx b/IGP/Localizations.resx
index bd9b6cc..fdd825a 100644
--- a/IGP/Localizations.resx
+++ b/IGP/Localizations.resx
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <root>
-    <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
+                xmlns="">
         <xsd:element name="root" msdata:IsDataSet="true">
-            
+
         </xsd:element>
     </xsd:schema>
     <resheader name="resmimetype">
@@ -13,12 +14,56 @@
         <value>1.3</value>
     </resheader>
     <resheader name="reader">
-        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
     </resheader>
     <resheader name="writer">
-        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral,
+            PublicKeyToken=b77a5c561934e089
+        </value>
     </resheader>
     <data name="Greeting" xml:space="preserve">
         <value>Hello</value>
     </data>
+
+    <data name="Tooltip Chart Info" xml:space="preserve">
+        <value>Shows economy at each game interval. Use to determine if spending additional resources on harvesters will help or hinder overall timing attack.</value>
+    </data>
+
+    <data name="Tooltip Filter Info" xml:space="preserve">
+        <value>Select build details, such as Faction and Immortal.
+
+Affects entities you can build.</value>
+    </data>
+    <data name="Tooltip Entity Info" xml:space="preserve">
+        <value>Summary of the entity you just selected.</value>
+    </data>
+    <data name="Tooltip Bank Info" xml:space="preserve">
+        <value>Bank at time of last requested action. Use this section to determine if your build is floating too much alloy or ether.</value>
+    </data>
+    <data name="Tooltip Army Info" xml:space="preserve">
+        <value>Overview of current army, and when it will be ready to begin an attack.</value>
+    </data>
+    <data name="Tooltip Highlights Info" xml:space="preserve">
+        <value>Timeline highlights of your build order. Shows when you start a new action and when the action is done.</value>
+    </data>
+    <data name="Tooltip BuildOrder Info" xml:space="preserve">
+        <value>Some raw JSON data to represent your build order.</value>
+    </data>
+    <data name="Tooltip Timing Info" xml:space="preserve">
+        <value>Enter build details.
+                                           
+&lt;b&gt;Timing Interval:&lt;/b&gt; set the max interval length for the build. &lt;i&gt;Ex. 240 (seconds) is 4 minutes, a possible timing for Thrum build order.&lt;/i&gt;
+&lt;b&gt;Name:&lt;/b&gt; the name of the build for saving purposes. &lt;i&gt;Ex. 'Safe Thrum Opener'&lt;/i&gt;
+&lt;b&gt;Notes:&lt;/b&gt; additional notes of the build for saving purposes. &lt;i&gt;Ex. 'Thrums are for harassing and defending against a ground Q'Rath army.'&lt;/i&gt;
+&lt;b&gt;Color:&lt;/b&gt; value to color charts when comparing builds. Not currently implemented.</value>
+    </data>
+    <data name="Tooltip Hotkey Info" xml:space="preserve">
+        <value>Click on the desired entity to build it. &lt;i&gt;You cannot build entities you cannot afford, construct an ether extractor before spending ether.&lt;/i&gt;
+
+You can also use the default Immortal hotkeys, but the above hotkey UI must have focus for this to work. &lt;i&gt;I.e. click on it if hotkeys aren't working, and a white border should appear after key input  to indicate focus.&lt;/i&gt;
+
+Additionally, more entities will appear as you build the required technology. You can click or press ` to remove the last made entity. &lt;i&gt;But you cannot remove the starting entities at interval 0.&lt;/i&gt;</value>
+    </data>
 </root>
\ No newline at end of file
diff --git a/IGP/Pages/Agile/AgilePage.razor b/IGP/Pages/Agile/AgilePage.razor
index d4450e0..ae354c1 100644
--- a/IGP/Pages/Agile/AgilePage.razor
+++ b/IGP/Pages/Agile/AgilePage.razor
@@ -7,11 +7,11 @@
 
 @if (!AgileService.IsLoaded())
 {
-    <LoadingComponent/>  
+    <LoadingComponent/>
 }
 else
 
-    
+
 {
     <LayoutMediumContentComponent>
 
diff --git a/IGP/Pages/BuildCalculator/BuildCalculatorPage.razor b/IGP/Pages/BuildCalculator/BuildCalculatorPage.razor
index c9ad5b3..11feb6f 100644
--- a/IGP/Pages/BuildCalculator/BuildCalculatorPage.razor
+++ b/IGP/Pages/BuildCalculator/BuildCalculatorPage.razor
@@ -1,11 +1,15 @@
-@implements IDisposable
+@using Microsoft.Extensions.Localization
+@implements IDisposable
 
 @layout PageLayout
 
+@inject IStringLocalizer<Localizations> locale
+
 @inject IKeyService keyService
 @inject IImmortalSelectionService filterService
 @inject IBuildOrderService buildOrderService
 @inject IEconomyService economyService
+@inject IToastService toastService
 @inject ITimingService timingService
 
 @page "/build-calculator"
@@ -26,7 +30,7 @@
     <div class="calculatorGrid">
 
         <div style="grid-area: timing;" class="gridItem">
-            <InfoTooltipComponent InfoText="">
+            <InfoTooltipComponent InfoText="@locale["Tooltip Timing Info"]" >
 
                 <TimingComponent></TimingComponent>
             </InfoTooltipComponent>
@@ -36,35 +40,35 @@
         @if (true)
         {
             <div style="grid-area: chart;" class="gridItem">
-                <InfoTooltipComponent InfoText="Shows economy at each game interval. Use to determine if spending additional resourcses on harvesters will help or hinder overall timing attack.">
+                <InfoTooltipComponent InfoText="@locale["Tooltip Chart Info"]">
                     <ChartComponent></ChartComponent>
                 </InfoTooltipComponent>
             </div>
         }
 
         <div style="grid-area: filter;" class="gridItem">
-            <InfoTooltipComponent InfoText="Select build details, such as Faction and Immortal. Affects entities you can build.">
+            <InfoTooltipComponent InfoText="@locale["Tooltip Filter Info"]">
                 <FilterComponent></FilterComponent>
             </InfoTooltipComponent>
         </div>
 
 
         <div style="grid-area: view;" class="gridItem">
-            <InfoTooltipComponent InfoText="Summary of the entity you just selected.">
-                <EntityClickViewComponent></EntityClickViewComponent>
+            <InfoTooltipComponent InfoText="@locale["Tooltip Entity Info"]">
+                <EntityClickViewComponent/>
             </InfoTooltipComponent>
         </div>
 
 
         <div style="grid-area: bank;" class="gridItem">
-            <InfoTooltipComponent InfoText="Bank at time of last requested action. Use this section to determine if your build is floating too much alloy or ether.">
+            <InfoTooltipComponent InfoText="@locale["Tooltip Bank Info"]">
                 <BankComponent></BankComponent>
             </InfoTooltipComponent>
         </div>
 
 
         <div style="grid-area: army;" class="gridItem">
-            <InfoTooltipComponent InfoText="Overview of current army, and when it will be ready to begin an attack.">
+            <InfoTooltipComponent InfoText="@locale["Tooltip Army Info"]">
                 <ArmyComponent></ArmyComponent>
             </InfoTooltipComponent>
         </div>
@@ -72,7 +76,7 @@
 
         <div class="gridItem gridKeys">
 
-            <InfoTooltipComponent InfoText="">
+            <InfoTooltipComponent InfoText="@locale["Tooltip Hotkey Info"]">
 
                 <HotkeyViewerComponent Size="80"></HotkeyViewerComponent>
             </InfoTooltipComponent>
@@ -87,13 +91,13 @@
         }
 
         <div style="grid-area: highlights;" class="gridItem">
-            <InfoTooltipComponent InfoText="Timeline highlights of your build order. Shows when you start a new action and when the action is done.">
+            <InfoTooltipComponent InfoText="@locale["Tooltip Highlights Info"]">
                 <HighlightsComponent></HighlightsComponent>
             </InfoTooltipComponent>
         </div>
 
         <div style="grid-area: buildorder;" class="gridItem">
-            <InfoTooltipComponent InfoText="Some raw JSON data to represent your build order.">
+            <InfoTooltipComponent InfoText="@locale["Tooltip BuildOrder Info"]">
                 <BuildOrderComponent></BuildOrderComponent>
             </InfoTooltipComponent>
         </div>
@@ -215,6 +219,7 @@
 
 
 @code {
+
     protected override void OnInitialized()
     {
         keyService.Subscribe(HandleClick);
@@ -265,7 +270,7 @@
         {
             return;
         }
-        if (buildOrderService.Add(entity, economyService))
+        if (buildOrderService.Add(entity, economyService, toastService))
         {
             economyService.Calculate(buildOrderService, timingService, buildOrderService.GetLastRequestInterval());
         }
diff --git a/IGP/Pages/BuildCalculator/Parts/EntityClickViewComponent.razor b/IGP/Pages/BuildCalculator/Parts/EntityClickViewComponent.razor
index 303de14..e2bceef 100644
--- a/IGP/Pages/BuildCalculator/Parts/EntityClickViewComponent.razor
+++ b/IGP/Pages/BuildCalculator/Parts/EntityClickViewComponent.razor
@@ -1,14 +1,25 @@
 @implements IDisposable
 
-<div style="overflow-y: scroll; width: 100%; overflow-x: hidden; height: 550px;">
-    @if (entity != null)
-    {
-        <EntityViewComponent Entity=Entity></EntityViewComponent>
+@if (entity != null)
+{
+    <div class="entityClickView">
+        <CascadingValue Value="entity">
+            <CascadingValue Value="@viewType">
+                <EntityViewComponent></EntityViewComponent>
+            </CascadingValue>
+        </CascadingValue>
+        }
+    </div>
+}
+<style>
+    .entityClickView {
+    overflow-y: scroll; width: 100%; overflow-x: hidden; height: 550px;
     }
-</div>
+</style>
 
 @code {
-    private EntityModel entity = default!;
+    private EntityModel? entity = default!;
+    private string viewType = "Detailed";
 
     [Inject]
     IKeyService KeyService { get; set; } = default!;
diff --git a/IGP/Pages/Comparision/ComparisionPage.razor b/IGP/Pages/Comparision/ComparisionPage.razor
index a65ed8b..5ad0c11 100644
--- a/IGP/Pages/Comparision/ComparisionPage.razor
+++ b/IGP/Pages/Comparision/ComparisionPage.razor
@@ -1,6 +1,8 @@
 @layout PageLayout
 @implements IDisposable
 
+@inject IToastService toastService
+
 <div style="display:grid; gap: 8px;padding: 16px; height: 94vh; width: 90vw; margin: auto; margin-top: 32px;
 grid-template-columns: 27% 25% 25% 23%; grid-template-rows: auto;
 grid-template-areas: 'loader sand compare compare' ;">
@@ -38,6 +40,7 @@ grid-template-areas: 'loader sand compare compare' ;">
 
     [Inject]
     IEconomyService EconomyService { get; set; } = default!;
+    
 
     [Inject]
     ITimingService TimingService { get; set; } = default!;
@@ -92,7 +95,7 @@ grid-template-areas: 'loader sand compare compare' ;">
         {
             return;
         }
-        if (BuildOrderService.Add(entity, EconomyService))
+        if (BuildOrderService.Add(entity, EconomyService, toastService))
         {
             EconomyService.Calculate(BuildOrderService, TimingService, BuildOrderService.GetLastRequestInterval());
         }
diff --git a/IGP/Pages/MakingOf/Parts/MakingOfColours.razor b/IGP/Pages/MakingOf/Parts/MakingOfColours.razor
index 07a662a..a32190d 100644
--- a/IGP/Pages/MakingOf/Parts/MakingOfColours.razor
+++ b/IGP/Pages/MakingOf/Parts/MakingOfColours.razor
@@ -15,6 +15,8 @@
         --paper-border: @paper_border;
         --info: @info;
         --info-border: @info_border;
+        --info-secondary: @info_secondary;
+        --info-secondary-border: @info_secondary_border;
     </CodeComponent>
     <br/>
     <div class="color accent">
@@ -71,7 +73,20 @@
         <div>
             Base: <input type="color" value="@info" @onchange="e => info = e.Value!.ToString()!"/>
         </div>
+        <div>
+            Border: <input type="color" value="@info_border" @onchange="e => info_border = e.Value!.ToString()!"/>
+        </div>
     </div>
+    
+     <div class="color info_secondary">
+            <div>Info Secondary</div>
+         <div>
+             Base: <input type="color" value="@info_secondary" @onchange="e => info_secondary = e.Value!.ToString()!"/>
+         </div>
+         <div>
+             Border: <input type="color" value="@info_secondary_border" @onchange="e => info_secondary_border = e.Value!.ToString()!"/>
+         </div>
+        </div>
 </div>
 
 <style>
@@ -89,6 +104,9 @@
         --paper-border: @paper_border;
         --info: @info;
         --info-border: @info_border;
+        
+        --info-secondary: @info_secondary;
+        --info-secondary-border: @info_secondary_border;
     }
 
     .colorContainer {
@@ -139,6 +157,12 @@
 
     .info {
         background-color: var(--info);
+        border: 1px solid var(--info-border);
+    }
+
+    .info_secondary {
+        background-color: var(--info-secondary);
+        border: 1px solid var(--info-secondary-border);
     }
 
 </style>
@@ -156,5 +180,9 @@
     string paper = "#252526";
     string paper_border = "#151516";
     string info = "#451376";
-    readonly string info_border = "#210b36";
+    string info_border = "#210b36";
+    string info_secondary = "#4c3e59";
+    string info_secondary_border = "#7e58a2";
+    
+
 }
\ No newline at end of file
diff --git a/IGP/Portals/ToastPortal.razor b/IGP/Portals/ToastPortal.razor
index 82c771b..aa43dc3 100644
--- a/IGP/Portals/ToastPortal.razor
+++ b/IGP/Portals/ToastPortal.razor
@@ -5,8 +5,7 @@
 @if (toastService.HasToasts())
 {
     <div class="toastsContainer">
-
-        @foreach (var toast in toastService.GetToasts())
+        @foreach( var toast in toastService.GetToasts())
         {
             <ToastComponent Toast="toast"/>
         }
@@ -18,12 +17,14 @@
         position: fixed;
         top: 64px;
         right: 64px;
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
     }
 </style>
 
 
 @code {
-
     protected override void OnInitialized()
     {
         toastService.Subscribe(OnUpdate);
@@ -38,5 +39,4 @@
     {
         StateHasChanged();
     }
-
 }
\ No newline at end of file
diff --git a/IGP/Program.cs b/IGP/Program.cs
index f1b71d1..3af9c8f 100644
--- a/IGP/Program.cs
+++ b/IGP/Program.cs
@@ -1,10 +1,10 @@
+using System.Globalization;
 using IGP;
 using Microsoft.AspNetCore.Components.Web;
 using Services;
 using Services.Development;
 using Services.Immortal;
 using Services.Website;
-using System.Globalization;
 
 #if NO_SQL
 #else
@@ -15,8 +15,6 @@ using Microsoft.EntityFrameworkCore;
 CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US");
 CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo("en-US");
 
-
-
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.Logging.SetMinimumLevel(LogLevel.Warning);
 
diff --git a/IGP/_Imports.razor b/IGP/_Imports.razor
index 6d70f71..bad566a 100644
--- a/IGP/_Imports.razor
+++ b/IGP/_Imports.razor
@@ -37,7 +37,7 @@
 @using Microsoft.EntityFrameworkCore
 @using Microsoft.JSInterop
 @using Model.Chart
-@using Model.Development.Git
+@using Model.Git
 @using Model.Doc
 @using Model.Economy
 @using Model.Entity
diff --git a/IGP/wwwroot/css/app.css b/IGP/wwwroot/css/app.css
index 5d65f2c..9d62ca0 100644
--- a/IGP/wwwroot/css/app.css
+++ b/IGP/wwwroot/css/app.css
@@ -31,6 +31,9 @@
     --info: #451376;
     --info-border: #210b36;
 
+    --info-secondary: #4c3e59;
+    --info-secondary-border: #7e58a2;
+    
     --info-hover: #451376;
     --info-border-hover: #210b36;
 
diff --git a/IGP/wwwroot/generated/AgileTaskModels.json b/IGP/wwwroot/generated/AgileTaskModels.json
index 32aa758..6214ed2 100644
--- a/IGP/wwwroot/generated/AgileTaskModels.json
+++ b/IGP/wwwroot/generated/AgileTaskModels.json
@@ -1 +1 @@
-[{"Id":1,"AgileSprintModelId":null,"Name":"Support Safari","Description":"Consider other web browsers.","Notes":"Added","Status":"Todo","Priority":"Low","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":2,"AgileSprintModelId":2,"Name":"Filter Patch Notes","Description":"You should be showing people what they really want to see in the patch notes.","Notes":"Added","Status":"Done","Priority":"Blocker","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":3,"AgileSprintModelId":5,"Name":"Consider Pyre","Description":"Add Pyre Income. Make it so you can take Pyre Camps and Pyre Miners","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":4,"AgileSprintModelId":5,"Name":"Optimizations","Description":"Build Calculator should be usable.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":5,"AgileSprintModelId":5,"Name":"Change Attack Timing Interval","Description":"Be able to set attack timing.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":6,"AgileSprintModelId":5,"Name":"Add Pyre Spells","Description":"Make Pyre Spells castable and consume Pyre on build order","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":7,"AgileSprintModelId":null,"Name":"Default builds (Rush Thrones)","Description":"Add a dropdown list of default builds.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":8,"AgileSprintModelId":null,"Name":"Load older builds","Description":"Be able to load older builds.  How are you going to handle auto correct to current patch?","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":9,"AgileSprintModelId":null,"Name":"How to use Build Calculator step by step","Description":"Need docs","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":10,"AgileSprintModelId":null,"Name":"Compare Health and Damage","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":11,"AgileSprintModelId":null,"Name":"Compare Unit\u0027s Damage with it\u0027s own costs","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":12,"AgileSprintModelId":4,"Name":"View one unit stats from a link. Make YAML copy and paste","Description":"Design so people can easily copy and paste data into discord","Notes":"Ended up not using exact Yaml. Button in Database controls Detailed vs Plain display ","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":13,"AgileSprintModelId":2,"Name":"Look into SQL","Description":"You really should be using SQL.","Notes":"Agile and Change log pages now use SQL","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":14,"AgileSprintModelId":1,"Name":"Mobile Menu","Description":"You need a real mobile menu. Viewers don\u0027t scroll below the fold, so no one is going to know what happens when you click a button on phones.","Notes":"Added smaller menus for tablets and phones.","Status":"Done","Priority":"High","Task":"Feature","Created":"2022-02-18T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":15,"AgileSprintModelId":2,"Name":"Acropolis Consume Mote","Description":"The Mote is suppose to be consumed when making a Town Hall.","Notes":"Fixed","Status":"Done","Priority":"High","Task":"Bug","Created":"2022-02-18T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":16,"AgileSprintModelId":5,"Name":"Multiple Travel Time in Harass Calculator","Description":"Travel time should be based on the amount of bases used. 3 bases is 3 travel times.","Notes":"Add notes...","Status":"Todo","Priority":"Low","Task":"Feature","Created":"2022-02-18T00:00:00","Finished":null},{"Id":17,"AgileSprintModelId":1,"Name":"Update Database to 0.0.6.8375a","Description":"Xacal tech change, and Hallower damage change. Update Godhead text.","Notes":"Done","Status":"Done","Priority":"None","Task":"Feature","Created":"2022-02-18T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":18,"AgileSprintModelId":null,"Name":"Patch History Viewer","Description":"Add an ability to compare patches, to see all nerfs and buffs made between them.","Notes":"Inspired by Zkay\u0027s post on discord, where he details a possible \u0027patch history viewer\u0027 implementation.","Status":"Fun_Idea","Priority":"None","Task":"Feature","Created":"2022-02-16T00:00:00","Finished":null},{"Id":19,"AgileSprintModelId":1,"Name":"Twitch Page","Description":"Did a ~3 hour test stream, and was personal quite happy with the quality. Make Twitch page, and stream patch, sprint planning and development on Sunday.","Notes":"Page added under General, and named \u0022Streams\u0022.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-16T00:00:00","Finished":"2022-02-16T00:00:00"},{"Id":20,"AgileSprintModelId":1,"Name":"Finish the database","Description":"Add more descriptions for everything. Reduce any data duplication with ids. Add upgrade connections. Add ability connections. Add passives and passives connections.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":21,"AgileSprintModelId":1,"Name":"Change Log View","Description":"Add a log to view last changes.","Notes":"Added changelog page. Shows Today, X Days Ago, or exact date if patch is over a week old.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-14T00:00:00","Finished":"2022-02-14T00:00:00"},{"Id":22,"AgileSprintModelId":1,"Name":"Agile View","Description":"Add the agile view.","Notes":"Finished.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-11T00:00:00","Finished":"2022-02-17T00:00:00"},{"Id":23,"AgileSprintModelId":1,"Name":"GUID for Ids","Description":"Stop using enums for ids, and start using guids. Enums are just too limited, I lose out on component and inheritance design with them. Replace all your enums with guids, rip off the bandaid.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-11T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":24,"AgileSprintModelId":1,"Name":"Co-op overview","Description":"Write some sort of blog on co-op gameplay so you have something the feels very content-ish. Maybe make it a video.","Notes":"Finished and released early.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-11T00:00:00","Finished":"2022-02-12T00:00:00"},{"Id":25,"AgileSprintModelId":1,"Name":"Mobile UI","Description":"Make website work on mobile.","Notes":"Should be good. Will test on phone later.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-15T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":26,"AgileSprintModelId":1,"Name":"Add Making Of View","Description":"View to reference UI designs. Nicely encourages the pratice of making the UI code a lot cleaner.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":27,"AgileSprintModelId":3,"Name":"Close Nav Menu on Navigation","Description":"Close Nav Menu on Navigation","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":28,"AgileSprintModelId":3,"Name":"Add Passive Descriptions and Passive","Description":"Have to guess on a bunch of passives","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-03-31T00:00:00"},{"Id":29,"AgileSprintModelId":3,"Name":"Tooltips that show referenced units","Description":"I should see any referenced unit by hovering over it","Notes":"Links can now go to links which can go to links.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":30,"AgileSprintModelId":null,"Name":"Update Logo for Website","Description":"After color scheme is picked","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":null},{"Id":31,"AgileSprintModelId":3,"Name":"Documentation page","Description":"Add documents on how to maintain website","Notes":"Added start of documents","Status":"Done","Priority":"Low","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":32,"AgileSprintModelId":null,"Name":"Test Automation","Description":"Selenium Tests","Notes":"Start adding IDs to everything","Status":"Todo","Priority":"Low","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":null},{"Id":33,"AgileSprintModelId":null,"Name":"Unit Test","Description":"Add some unit tests","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":null},{"Id":34,"AgileSprintModelId":4,"Name":"Fully Transfer everything to SQL","Description":"Need to regenerate the database once everthing is fully transfered","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-04-09T00:00:00"},{"Id":35,"AgileSprintModelId":3,"Name":"Adding a loading Component","Description":"For JSON loading","Notes":"Added loading component to Agile and Changelog screens","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":36,"AgileSprintModelId":3,"Name":"Optimize Loading of Data","Description":"Currently loading non Agile stuff on Agile page","Notes":"Moved SQL database injection to app root","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":37,"AgileSprintModelId":3,"Name":"Convert Notes to Markdown","Description":"Using Markdown and generating the Note pages seems like a better solution to SQL or hardcoding data","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":38,"AgileSprintModelId":3,"Name":"Improve Entity Filter Options","Description":"The options I give you is strange, given it filers on Faction type","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","Created":"2022-04-01T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":39,"AgileSprintModelId":4,"Name":"Refresh Database Bug","Description":"Database dialog UI isn\u0027t refreshing enough","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","Created":"2022-04-03T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":40,"AgileSprintModelId":4,"Name":"Branding Stuff","Description":"Add a schedule, improving branding, etc, ","Notes":"Only improved Twitch overlays","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-04-03T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":41,"AgileSprintModelId":4,"Name":"Improve Documents/Notes UI","Description":"Should have a left navigation menu. And prev/next buttons","Notes":"Updated UI. Will added prev/next and breadcrumbs later","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-04-05T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":42,"AgileSprintModelId":5,"Name":"Add GitHub links instead of showing code","Description":"For all code examples","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":43,"AgileSprintModelId":5,"Name":"Research More used RTS calculations","Description":"What other calculators like the Harass Page can be added","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2001-01-01T00:00:00","Finished":null},{"Id":44,"AgileSprintModelId":5,"Name":"Add Error Toasts to Calculator","Description":"Not enough \u0022Ether\u0022","Notes":"Add notes...","Status":"In_Progress","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":45,"AgileSprintModelId":5,"Name":"Handle Divide by Zero in Harass Calculator","Description":"addDescription","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":46,"AgileSprintModelId":5,"Name":"Harass Calculator first user experience","Description":"Navigate player though the harass calculator steps","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":47,"AgileSprintModelId":5,"Name":"Training Queue","Description":"Add training queue times to the build calculator","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":48,"AgileSprintModelId":5,"Name":"Refresh Button for Build Calculator","Description":"Refresh to regenerate timeline and charts","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":49,"AgileSprintModelId":5,"Name":"Gameplay Warning State Toasts","Description":"\u0022You should upgrade your economy.\u0022 \u0022Your using too much ether, spend alloy\u0022","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":50,"AgileSprintModelId":5,"Name":"Make desktop navigation buttons","Description":"It popping up all the time is a tad tedious","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null}]
\ No newline at end of file
+[{"Id":1,"AgileSprintModelId":null,"Name":"Support Safari","Description":"Consider other web browsers.","Notes":"Added","Status":"Todo","Priority":"Low","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":2,"AgileSprintModelId":2,"Name":"Filter Patch Notes","Description":"You should be showing people what they really want to see in the patch notes.","Notes":"Added","Status":"Done","Priority":"Blocker","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":3,"AgileSprintModelId":5,"Name":"Consider Pyre","Description":"Add Pyre Income. Make it so you can take Pyre Camps and Pyre Miners","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":4,"AgileSprintModelId":5,"Name":"Optimizations","Description":"Build Calculator should be usable.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":5,"AgileSprintModelId":5,"Name":"Change Attack Timing Interval","Description":"Be able to set attack timing.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":6,"AgileSprintModelId":5,"Name":"Add Pyre Spells","Description":"Make Pyre Spells castable and consume Pyre on build order","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":7,"AgileSprintModelId":null,"Name":"Default builds (Rush Thrones)","Description":"Add a dropdown list of default builds.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":8,"AgileSprintModelId":null,"Name":"Load older builds","Description":"Be able to load older builds.  How are you going to handle auto correct to current patch?","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":9,"AgileSprintModelId":null,"Name":"How to use Build Calculator step by step","Description":"Need docs","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":10,"AgileSprintModelId":null,"Name":"Compare Health and Damage","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":11,"AgileSprintModelId":null,"Name":"Compare Unit\u0027s Damage with it\u0027s own costs","Description":"Refer to community example spreadsheet.","Notes":"Add notes...","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":12,"AgileSprintModelId":4,"Name":"View one unit stats from a link. Make YAML copy and paste","Description":"Design so people can easily copy and paste data into discord","Notes":"Ended up not using exact Yaml. Button in Database controls Detailed vs Plain display ","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":13,"AgileSprintModelId":2,"Name":"Look into SQL","Description":"You really should be using SQL.","Notes":"Agile and Change log pages now use SQL","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-20T00:00:00","Finished":null},{"Id":14,"AgileSprintModelId":1,"Name":"Mobile Menu","Description":"You need a real mobile menu. Viewers don\u0027t scroll below the fold, so no one is going to know what happens when you click a button on phones.","Notes":"Added smaller menus for tablets and phones.","Status":"Done","Priority":"High","Task":"Feature","Created":"2022-02-18T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":15,"AgileSprintModelId":2,"Name":"Acropolis Consume Mote","Description":"The Mote is suppose to be consumed when making a Town Hall.","Notes":"Fixed","Status":"Done","Priority":"High","Task":"Bug","Created":"2022-02-18T00:00:00","Finished":"2022-02-20T00:00:00"},{"Id":16,"AgileSprintModelId":5,"Name":"Multiple Travel Time in Harass Calculator","Description":"Travel time should be based on the amount of bases used. 3 bases is 3 travel times.","Notes":"Add notes...","Status":"Todo","Priority":"Low","Task":"Feature","Created":"2022-02-18T00:00:00","Finished":null},{"Id":17,"AgileSprintModelId":1,"Name":"Update Database to 0.0.6.8375a","Description":"Xacal tech change, and Hallower damage change. Update Godhead text.","Notes":"Done","Status":"Done","Priority":"None","Task":"Feature","Created":"2022-02-18T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":18,"AgileSprintModelId":null,"Name":"Patch History Viewer","Description":"Add an ability to compare patches, to see all nerfs and buffs made between them.","Notes":"Inspired by Zkay\u0027s post on discord, where he details a possible \u0027patch history viewer\u0027 implementation.","Status":"Fun_Idea","Priority":"None","Task":"Feature","Created":"2022-02-16T00:00:00","Finished":null},{"Id":19,"AgileSprintModelId":1,"Name":"Twitch Page","Description":"Did a ~3 hour test stream, and was personal quite happy with the quality. Make Twitch page, and stream patch, sprint planning and development on Sunday.","Notes":"Page added under General, and named \u0022Streams\u0022.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-16T00:00:00","Finished":"2022-02-16T00:00:00"},{"Id":20,"AgileSprintModelId":1,"Name":"Finish the database","Description":"Add more descriptions for everything. Reduce any data duplication with ids. Add upgrade connections. Add ability connections. Add passives and passives connections.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":21,"AgileSprintModelId":1,"Name":"Change Log View","Description":"Add a log to view last changes.","Notes":"Added changelog page. Shows Today, X Days Ago, or exact date if patch is over a week old.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-14T00:00:00","Finished":"2022-02-14T00:00:00"},{"Id":22,"AgileSprintModelId":1,"Name":"Agile View","Description":"Add the agile view.","Notes":"Finished.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-11T00:00:00","Finished":"2022-02-17T00:00:00"},{"Id":23,"AgileSprintModelId":1,"Name":"GUID for Ids","Description":"Stop using enums for ids, and start using guids. Enums are just too limited, I lose out on component and inheritance design with them. Replace all your enums with guids, rip off the bandaid.","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-11T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":24,"AgileSprintModelId":1,"Name":"Co-op overview","Description":"Write some sort of blog on co-op gameplay so you have something the feels very content-ish. Maybe make it a video.","Notes":"Finished and released early.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-11T00:00:00","Finished":"2022-02-12T00:00:00"},{"Id":25,"AgileSprintModelId":1,"Name":"Mobile UI","Description":"Make website work on mobile.","Notes":"Should be good. Will test on phone later.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-15T00:00:00","Finished":"2022-02-18T00:00:00"},{"Id":26,"AgileSprintModelId":1,"Name":"Add Making Of View","Description":"View to reference UI designs. Nicely encourages the pratice of making the UI code a lot cleaner.","Notes":"Good enough for now","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-02-11T00:00:00","Finished":"2022-02-19T00:00:00"},{"Id":27,"AgileSprintModelId":3,"Name":"Close Nav Menu on Navigation","Description":"Close Nav Menu on Navigation","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":28,"AgileSprintModelId":3,"Name":"Add Passive Descriptions and Passive","Description":"Have to guess on a bunch of passives","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-03-31T00:00:00"},{"Id":29,"AgileSprintModelId":3,"Name":"Tooltips that show referenced units","Description":"I should see any referenced unit by hovering over it","Notes":"Links can now go to links which can go to links.","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":30,"AgileSprintModelId":null,"Name":"Update Logo for Website","Description":"After color scheme is picked","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":null},{"Id":31,"AgileSprintModelId":3,"Name":"Documentation page","Description":"Add documents on how to maintain website","Notes":"Added start of documents","Status":"Done","Priority":"Low","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":32,"AgileSprintModelId":null,"Name":"Test Automation","Description":"Selenium Tests","Notes":"Start adding IDs to everything","Status":"Todo","Priority":"Low","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":null},{"Id":33,"AgileSprintModelId":null,"Name":"Unit Test","Description":"Add some unit tests","Notes":null,"Status":"Todo","Priority":"Low","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":null},{"Id":34,"AgileSprintModelId":4,"Name":"Fully Transfer everything to SQL","Description":"Need to regenerate the database once everthing is fully transfered","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-04-09T00:00:00"},{"Id":35,"AgileSprintModelId":3,"Name":"Adding a loading Component","Description":"For JSON loading","Notes":"Added loading component to Agile and Changelog screens","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":36,"AgileSprintModelId":3,"Name":"Optimize Loading of Data","Description":"Currently loading non Agile stuff on Agile page","Notes":"Moved SQL database injection to app root","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-03-27T00:00:00"},{"Id":37,"AgileSprintModelId":3,"Name":"Convert Notes to Markdown","Description":"Using Markdown and generating the Note pages seems like a better solution to SQL or hardcoding data","Notes":null,"Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-03-27T00:00:00","Finished":"2022-04-01T00:00:00"},{"Id":38,"AgileSprintModelId":3,"Name":"Improve Entity Filter Options","Description":"The options I give you is strange, given it filers on Faction type","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","Created":"2022-04-01T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":39,"AgileSprintModelId":4,"Name":"Refresh Database Bug","Description":"Database dialog UI isn\u0027t refreshing enough","Notes":null,"Status":"Done","Priority":"High","Task":"Bug","Created":"2022-04-03T00:00:00","Finished":"2022-04-03T00:00:00"},{"Id":40,"AgileSprintModelId":4,"Name":"Branding Stuff","Description":"Add a schedule, improving branding, etc, ","Notes":"Only improved Twitch overlays","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-04-03T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":41,"AgileSprintModelId":4,"Name":"Improve Documents/Notes UI","Description":"Should have a left navigation menu. And prev/next buttons","Notes":"Updated UI. Will added prev/next and breadcrumbs later","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-04-05T00:00:00","Finished":"2022-04-10T00:00:00"},{"Id":42,"AgileSprintModelId":5,"Name":"Add GitHub links instead of showing code","Description":"For all code examples","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":43,"AgileSprintModelId":5,"Name":"Research More used RTS calculations","Description":"What other calculators like the Harass Page can be added","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2001-01-01T00:00:00","Finished":null},{"Id":44,"AgileSprintModelId":5,"Name":"Add Error Toasts to Calculator","Description":"Not enough \u0022Ether\u0022","Notes":"Add notes...","Status":"Done","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":45,"AgileSprintModelId":5,"Name":"Handle Divide by Zero in Harass Calculator","Description":"addDescription","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":46,"AgileSprintModelId":5,"Name":"Harass Calculator first user experience","Description":"Navigate player though the harass calculator steps","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":47,"AgileSprintModelId":5,"Name":"Training Queue","Description":"Add training queue times to the build calculator","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":48,"AgileSprintModelId":5,"Name":"Refresh Button for Build Calculator","Description":"Refresh to regenerate timeline and charts","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":49,"AgileSprintModelId":5,"Name":"Gameplay Warning State Toasts","Description":"\u0022You should upgrade your economy.\u0022 \u0022Your using too much ether, spend alloy\u0022","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":50,"AgileSprintModelId":5,"Name":"Make desktop navigation buttons","Description":"It popping up all the time is a tad tedious","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null},{"Id":51,"AgileSprintModelId":5,"Name":"Working Timers","Description":"Toast dismiss timers not making sense. Look into proper Timers","Notes":"addNotes","Status":"Todo","Priority":"Medium","Task":"Feature","Created":"2022-04-10T00:00:00","Finished":null}]
\ No newline at end of file
diff --git a/IGP/wwwroot/generated/GitChangeModels.json b/IGP/wwwroot/generated/GitChangeModels.json
index 9f2acd9..b2fc891 100644
--- a/IGP/wwwroot/generated/GitChangeModels.json
+++ b/IGP/wwwroot/generated/GitChangeModels.json
@@ -1 +1 @@
-[{"Id":1,"GitPatchModelId":1,"Name":"Shrink Header Navigation","Description":"The full header navigation is now only visible on desktop when hovered.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":2,"GitPatchModelId":1,"Name":"Database UX Update","Description":"Desktop Database Filter UI has been updated. It\u0027s now always visible.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":3,"GitPatchModelId":2,"Name":"Fixing Thrum Stats","Description":"Speed was too low. Health and Shields ratio is slightly different.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":4,"GitPatchModelId":3,"Name":"Memory Tester","Description":"Fun quick feature added while I rewrite my database. Tests memory of units ranges and speeds.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":5,"GitPatchModelId":3,"Name":"Privacy Policy Removed","Description":"Removed cringe privacy policy. It misses the issue. Will eventually add operational analytics and cookies, and add a more applicable Privacy Policy if needed. Not a priority though.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":6,"GitPatchModelId":3,"Name":"Input Tripling","Description":"Fixed a bug where inputs could get tripled on the Build Calculator.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":7,"GitPatchModelId":3,"Name":"Agile Changes","Description":"Updated Agile log to indicate the next 2 weeks will be spent on SQL","Commit":"Planning","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":8,"GitPatchModelId":4,"Name":"Hiding WIP Pyre Feature","Description":"Whoops, WIP Pyre feature accidentally got committed to production. Now hidden.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":9,"GitPatchModelId":5,"Name":"Build Calc Optimization","Description":"Improved speeds","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":10,"GitPatchModelId":5,"Name":"Change Log Filter","Description":"Change log now defaults to showing only important patches","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":11,"GitPatchModelId":5,"Name":"Motes Consumed","Description":"Motes now consumed in the build calculator when making a townhall.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":12,"GitPatchModelId":6,"Name":"Agile UI Tweaks","Description":"Making the agile text look a bit better before stream.","Commit":"Style","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":13,"GitPatchModelId":7,"Name":"Database Armor","Description":"Added missing armor display to database.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":14,"GitPatchModelId":8,"Name":"Home Page","Description":"Added a quick placeholder-ish homepage.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":15,"GitPatchModelId":8,"Name":"Database Army Default","Description":"Database UI now defaults to Army selection. Given most people are probably going to want to view the units.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":16,"GitPatchModelId":9,"Name":"Mobile Menu Back","Description":"You can now click the page after selecting a Section, to go back to Section nav.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":17,"GitPatchModelId":10,"Name":"Mobile Menu Fixed","Description":"Fixed the mobile menu not actually being positioned to the bottom of the screen on phones.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":18,"GitPatchModelId":11,"Name":"Tablet Menu","Description":"Added a hamburger nav menu for tablets.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":19,"GitPatchModelId":11,"Name":"Mobile Menu","Description":"Added a bottom nav menu for phones.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":20,"GitPatchModelId":12,"Name":"0.0.6.8375a","Description":"Database updated to 0.0.6.8375a","Commit":"Game Patch","Date":"2022-03-26T20:32:02","Important":"True"},{"Id":21,"GitPatchModelId":12,"Name":"Database Descriptions","Description":"Added more text descriptions to buildings and etc..","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":22,"GitPatchModelId":12,"Name":"Guids","Description":"Now using Guids and strings over enums. View in /raw-database page.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":23,"GitPatchModelId":12,"Name":"Mobile UI","Description":"Additional mobile UI improvements. Harass calculator now has fewer inputs that don\u0027t matter.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":24,"GitPatchModelId":12,"Name":"Bug Tasks","Description":"Added feature/bug task indicator to agile view. Added consume mote bug in build calculator to next sprint. (Calculator not consuming motes on Town Hall building)","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":25,"GitPatchModelId":12,"Name":"Entity Display UI","Description":"Display UI improved. Build Calculator now uses the same Entity display UI as the Database.","Commit":"Style","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":26,"GitPatchModelId":13,"Name":"Removed Embedded YouTube","Description":"Having embedded videos makes my privacy policy look completely untrue. Removed the video (it\u0027s now a link) and added a message on the privacy policy to point out that the error occured.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":27,"GitPatchModelId":13,"Name":"Agile View Backlog","Description":"Added backlog rendering to the Agile View Page. Added priority level to better indicate what tasks have high or zero priority.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":28,"GitPatchModelId":14,"Name":"Privacy Policy Page","Description":"The privacy policy is now a page rather than a blurb on the About page.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":29,"GitPatchModelId":14,"Name":"Privacy Policy Update","Description":"I added information on how I use personal data. And a disclaimer that privacy can never be guaranteed.","Commit":"Privacy Policy","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":30,"GitPatchModelId":14,"Name":"Minor Tweaks","Description":"Minor UI changes and text fixes.","Commit":"None","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":31,"GitPatchModelId":15,"Name":"Homepage","Description":"Making Of page no longer shows on the homepage","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":32,"GitPatchModelId":15,"Name":"DevOnly Component","Description":"Added a DevOnly component to wrap UI content that should not be released to production. I.e. the Homepage bug.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":33,"GitPatchModelId":16,"Name":"Agile View","Description":"Add an agile page to show current activities.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":34,"GitPatchModelId":16,"Name":"Rendering Entire Database","Description":"I can now render the database without lag. Not sure what fixed it.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":35,"GitPatchModelId":16,"Name":"Database Data","Description":"Added a ton of data to the database. Such as various descriptions. More work is still to be done.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":36,"GitPatchModelId":16,"Name":"Database Ids","Description":"Database has less duplicated content. Army entities now link to their Upgrades and Abilities. More work is still to be done.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":37,"GitPatchModelId":16,"Name":"Blades of the Godhead Requirement","Description":"Fixed the requirement incorrectly being the Eye of Aros. Now is properly Bearer of the Crown.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":38,"GitPatchModelId":16,"Name":"UI Changes","Description":"Various UI changes and tweaks","Commit":"Style","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":39,"GitPatchModelId":16,"Name":"Streams","Description":"Added a Streams page. It mentions plans to do Twitch streams on Sunday.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":40,"GitPatchModelId":16,"Name":"IMMORTAL","Description":"Fixed \u0022IMMORTAL: Gates of Pyre\u0022 game title. Will no longer refer to it as \u0022Immortal: Gates of Pyre\u0022.","Commit":"Typo","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":41,"GitPatchModelId":16,"Name":"Mobile Support","Description":"All the pages should now work on phones.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":42,"GitPatchModelId":17,"Name":"Form Text","Description":"Fixed search bar in database, name and colour in build calculator, from not rendering \uD83D\uDE10","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":43,"GitPatchModelId":17,"Name":"UI Test Automation Road Map","Description":"Adding test automation to the roadmap","Commit":"Planning","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":44,"GitPatchModelId":18,"Name":"Build Calculator Interval","Description":"600 is too laggy. Reducing to 360 until optimizations are done.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":45,"GitPatchModelId":18,"Name":"Changelog Patch Date","Description":"Fixed date on previous patch in changelog. Should be one day earlier.","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":46,"GitPatchModelId":19,"Name":"UI Overhaul","Description":"Cleaned up and restyled a lot of UI. Like Page Containers, Alerts, Forms, Nav Buttons, and more.","Commit":"Style","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":47,"GitPatchModelId":19,"Name":"Separate Pages","Description":"Navigation now uses different pages, instead of loading content onto the main page.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":48,"GitPatchModelId":19,"Name":"Making Of","Description":"Adding Making Of page for design reference.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":49,"GitPatchModelId":19,"Name":"Change Log","Description":"Adding Change Log page for viewing update history.","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":50,"GitPatchModelId":19,"Name":"Mobile Priority","Description":"Changed mobile support priority in roadmap from low and possible to high and planned, and updated description.","Commit":"Planning","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":51,"GitPatchModelId":20,"Name":"Purple Colours","Description":"Added placeholder-ish purple color scheme.","Commit":"Style","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":52,"GitPatchModelId":20,"Name":"SQL","Description":"Agile and Change Log pages now use JSON made from SQL","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":53,"GitPatchModelId":21,"Name":"Discord Link","Description":"Made a discord for the website, and added invite link to contact page","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":54,"GitPatchModelId":21,"Name":"Loading Improvemnts","Description":"Agile and Change Log loading improved","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":55,"GitPatchModelId":21,"Name":"Desktop Nav closing","Description":"Desktop nav menu now closes when a page link is clicked","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":56,"GitPatchModelId":22,"Name":"0.0.6.8900a","Description":"Database updated to 0.0.6.8900a","Commit":"Game Patch","Date":"2022-03-26T20:32:02","Important":"True"},{"Id":57,"GitPatchModelId":23,"Name":"Database Links","Description":"Various entity references in the database now link to the entity via a dialog interface","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":58,"GitPatchModelId":24,"Name":"Documentation Page","Description":"Added a docs page with some starter setup information","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":59,"GitPatchModelId":24,"Name":"Database Filters","Description":"Fixed filter defaults. Removed unimportant filter types","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":60,"GitPatchModelId":25,"Name":"Database Fixes","Description":"Various fixes to bad data. Added some missing entities","Commit":"Fix","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":61,"GitPatchModelId":25,"Name":"Plain View","Description":"Database can now change to plain view for easy copy and pasting","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":62,"GitPatchModelId":25,"Name":"Direct Links","Description":"Database now supports direct links. database/Throne to see just Throne","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":63,"GitPatchModelId":26,"Name":"Better Navigation","Description":"Documentational pages now use a more logical navigation format, with sections, and parent-child documents","Commit":"Feature","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":64,"GitPatchModelId":26,"Name":"Style Improvements","Description":"Improved home page styling on website highlighted content","Commit":"Style","Date":"2022-03-26T20:32:02","Important":"False"},{"Id":65,"GitPatchModelId":26,"Name":"Warning Cleanup","Description":"Removed a bunch of development code warnings","Commit":"Chore","Date":"2022-03-26T20:32:02","Important":"False"}]
\ No newline at end of file
+[{"Id":1,"GitPatchModelId":1,"Name":"Shrink Header Navigation","Description":"The full header navigation is now only visible on desktop when hovered.","Commit":"Feature","Important":"False"},{"Id":2,"GitPatchModelId":1,"Name":"Database UX Update","Description":"Desktop Database Filter UI has been updated. It\u0027s now always visible.","Commit":"Feature","Important":"False"},{"Id":3,"GitPatchModelId":2,"Name":"Fixing Thrum Stats","Description":"Speed was too low. Health and Shields ratio is slightly different.","Commit":"Fix","Important":"False"},{"Id":4,"GitPatchModelId":3,"Name":"Memory Tester","Description":"Fun quick feature added while I rewrite my database. Tests memory of units ranges and speeds.","Commit":"Feature","Important":"False"},{"Id":5,"GitPatchModelId":3,"Name":"Privacy Policy Removed","Description":"Removed cringe privacy policy. It misses the issue. Will eventually add operational analytics and cookies, and add a more applicable Privacy Policy if needed. Not a priority though.","Commit":"Fix","Important":"False"},{"Id":6,"GitPatchModelId":3,"Name":"Input Tripling","Description":"Fixed a bug where inputs could get tripled on the Build Calculator.","Commit":"Fix","Important":"False"},{"Id":7,"GitPatchModelId":3,"Name":"Agile Changes","Description":"Updated Agile log to indicate the next 2 weeks will be spent on SQL","Commit":"Planning","Important":"False"},{"Id":8,"GitPatchModelId":4,"Name":"Hiding WIP Pyre Feature","Description":"Whoops, WIP Pyre feature accidentally got committed to production. Now hidden.","Commit":"Fix","Important":"False"},{"Id":9,"GitPatchModelId":5,"Name":"Build Calc Optimization","Description":"Improved speeds","Commit":"Fix","Important":"False"},{"Id":10,"GitPatchModelId":5,"Name":"Change Log Filter","Description":"Change log now defaults to showing only important patches","Commit":"Feature","Important":"False"},{"Id":11,"GitPatchModelId":5,"Name":"Motes Consumed","Description":"Motes now consumed in the build calculator when making a townhall.","Commit":"Fix","Important":"False"},{"Id":12,"GitPatchModelId":6,"Name":"Agile UI Tweaks","Description":"Making the agile text look a bit better before stream.","Commit":"Style","Important":"False"},{"Id":13,"GitPatchModelId":7,"Name":"Database Armor","Description":"Added missing armor display to database.","Commit":"Fix","Important":"False"},{"Id":14,"GitPatchModelId":8,"Name":"Home Page","Description":"Added a quick placeholder-ish homepage.","Commit":"Feature","Important":"False"},{"Id":15,"GitPatchModelId":8,"Name":"Database Army Default","Description":"Database UI now defaults to Army selection. Given most people are probably going to want to view the units.","Commit":"Fix","Important":"False"},{"Id":16,"GitPatchModelId":9,"Name":"Mobile Menu Back","Description":"You can now click the page after selecting a Section, to go back to Section nav.","Commit":"Fix","Important":"False"},{"Id":17,"GitPatchModelId":10,"Name":"Mobile Menu Fixed","Description":"Fixed the mobile menu not actually being positioned to the bottom of the screen on phones.","Commit":"Fix","Important":"False"},{"Id":18,"GitPatchModelId":11,"Name":"Tablet Menu","Description":"Added a hamburger nav menu for tablets.","Commit":"Feature","Important":"False"},{"Id":19,"GitPatchModelId":11,"Name":"Mobile Menu","Description":"Added a bottom nav menu for phones.","Commit":"Feature","Important":"False"},{"Id":20,"GitPatchModelId":12,"Name":"0.0.6.8375a","Description":"Database updated to 0.0.6.8375a","Commit":"Game Patch","Important":"True"},{"Id":21,"GitPatchModelId":12,"Name":"Database Descriptions","Description":"Added more text descriptions to buildings and etc..","Commit":"Feature","Important":"False"},{"Id":22,"GitPatchModelId":12,"Name":"Guids","Description":"Now using Guids and strings over enums. View in /raw-database page.","Commit":"Feature","Important":"False"},{"Id":23,"GitPatchModelId":12,"Name":"Mobile UI","Description":"Additional mobile UI improvements. Harass calculator now has fewer inputs that don\u0027t matter.","Commit":"Feature","Important":"False"},{"Id":24,"GitPatchModelId":12,"Name":"Bug Tasks","Description":"Added feature/bug task indicator to agile view. Added consume mote bug in build calculator to next sprint. (Calculator not consuming motes on Town Hall building)","Commit":"Feature","Important":"False"},{"Id":25,"GitPatchModelId":12,"Name":"Entity Display UI","Description":"Display UI improved. Build Calculator now uses the same Entity display UI as the Database.","Commit":"Style","Important":"False"},{"Id":26,"GitPatchModelId":13,"Name":"Removed Embedded YouTube","Description":"Having embedded videos makes my privacy policy look completely untrue. Removed the video (it\u0027s now a link) and added a message on the privacy policy to point out that the error occured.","Commit":"Fix","Important":"False"},{"Id":27,"GitPatchModelId":13,"Name":"Agile View Backlog","Description":"Added backlog rendering to the Agile View Page. Added priority level to better indicate what tasks have high or zero priority.","Commit":"Feature","Important":"False"},{"Id":28,"GitPatchModelId":14,"Name":"Privacy Policy Page","Description":"The privacy policy is now a page rather than a blurb on the About page.","Commit":"Feature","Important":"False"},{"Id":29,"GitPatchModelId":14,"Name":"Privacy Policy Update","Description":"I added information on how I use personal data. And a disclaimer that privacy can never be guaranteed.","Commit":"Privacy Policy","Important":"False"},{"Id":30,"GitPatchModelId":14,"Name":"Minor Tweaks","Description":"Minor UI changes and text fixes.","Commit":"None","Important":"False"},{"Id":31,"GitPatchModelId":15,"Name":"Homepage","Description":"Making Of page no longer shows on the homepage","Commit":"Fix","Important":"False"},{"Id":32,"GitPatchModelId":15,"Name":"DevOnly Component","Description":"Added a DevOnly component to wrap UI content that should not be released to production. I.e. the Homepage bug.","Commit":"Feature","Important":"False"},{"Id":33,"GitPatchModelId":16,"Name":"Agile View","Description":"Add an agile page to show current activities.","Commit":"Feature","Important":"False"},{"Id":34,"GitPatchModelId":16,"Name":"Rendering Entire Database","Description":"I can now render the database without lag. Not sure what fixed it.","Commit":"Fix","Important":"False"},{"Id":35,"GitPatchModelId":16,"Name":"Database Data","Description":"Added a ton of data to the database. Such as various descriptions. More work is still to be done.","Commit":"Feature","Important":"False"},{"Id":36,"GitPatchModelId":16,"Name":"Database Ids","Description":"Database has less duplicated content. Army entities now link to their Upgrades and Abilities. More work is still to be done.","Commit":"Feature","Important":"False"},{"Id":37,"GitPatchModelId":16,"Name":"Blades of the Godhead Requirement","Description":"Fixed the requirement incorrectly being the Eye of Aros. Now is properly Bearer of the Crown.","Commit":"Fix","Important":"False"},{"Id":38,"GitPatchModelId":16,"Name":"UI Changes","Description":"Various UI changes and tweaks","Commit":"Style","Important":"False"},{"Id":39,"GitPatchModelId":16,"Name":"Streams","Description":"Added a Streams page. It mentions plans to do Twitch streams on Sunday.","Commit":"Feature","Important":"False"},{"Id":40,"GitPatchModelId":16,"Name":"IMMORTAL","Description":"Fixed \u0022IMMORTAL: Gates of Pyre\u0022 game title. Will no longer refer to it as \u0022Immortal: Gates of Pyre\u0022.","Commit":"Typo","Important":"False"},{"Id":41,"GitPatchModelId":16,"Name":"Mobile Support","Description":"All the pages should now work on phones.","Commit":"Feature","Important":"False"},{"Id":42,"GitPatchModelId":17,"Name":"Form Text","Description":"Fixed search bar in database, name and colour in build calculator, from not rendering \uD83D\uDE10","Commit":"Fix","Important":"False"},{"Id":43,"GitPatchModelId":17,"Name":"UI Test Automation Road Map","Description":"Adding test automation to the roadmap","Commit":"Planning","Important":"False"},{"Id":44,"GitPatchModelId":18,"Name":"Build Calculator Interval","Description":"600 is too laggy. Reducing to 360 until optimizations are done.","Commit":"Fix","Important":"False"},{"Id":45,"GitPatchModelId":18,"Name":"Changelog Patch Date","Description":"Fixed date on previous patch in changelog. Should be one day earlier.","Commit":"Fix","Important":"False"},{"Id":46,"GitPatchModelId":19,"Name":"UI Overhaul","Description":"Cleaned up and restyled a lot of UI. Like Page Containers, Alerts, Forms, Nav Buttons, and more.","Commit":"Style","Important":"False"},{"Id":47,"GitPatchModelId":19,"Name":"Separate Pages","Description":"Navigation now uses different pages, instead of loading content onto the main page.","Commit":"Feature","Important":"False"},{"Id":48,"GitPatchModelId":19,"Name":"Making Of","Description":"Adding Making Of page for design reference.","Commit":"Feature","Important":"False"},{"Id":49,"GitPatchModelId":19,"Name":"Change Log","Description":"Adding Change Log page for viewing update history.","Commit":"Feature","Important":"False"},{"Id":50,"GitPatchModelId":19,"Name":"Mobile Priority","Description":"Changed mobile support priority in roadmap from low and possible to high and planned, and updated description.","Commit":"Planning","Important":"False"},{"Id":51,"GitPatchModelId":20,"Name":"Purple Colours","Description":"Added placeholder-ish purple color scheme.","Commit":"Style","Important":"False"},{"Id":52,"GitPatchModelId":20,"Name":"SQL","Description":"Agile and Change Log pages now use JSON made from SQL","Commit":"Feature","Important":"False"},{"Id":53,"GitPatchModelId":21,"Name":"Discord Link","Description":"Made a discord for the website, and added invite link to contact page","Commit":"Feature","Important":"False"},{"Id":54,"GitPatchModelId":21,"Name":"Loading Improvemnts","Description":"Agile and Change Log loading improved","Commit":"Feature","Important":"False"},{"Id":55,"GitPatchModelId":21,"Name":"Desktop Nav closing","Description":"Desktop nav menu now closes when a page link is clicked","Commit":"Feature","Important":"False"},{"Id":56,"GitPatchModelId":22,"Name":"0.0.6.8900a","Description":"Database updated to 0.0.6.8900a","Commit":"Game Patch","Important":"True"},{"Id":57,"GitPatchModelId":23,"Name":"Database Links","Description":"Various entity references in the database now link to the entity via a dialog interface","Commit":"Feature","Important":"False"},{"Id":58,"GitPatchModelId":24,"Name":"Documentation Page","Description":"Added a docs page with some starter setup information","Commit":"Feature","Important":"False"},{"Id":59,"GitPatchModelId":24,"Name":"Database Filters","Description":"Fixed filter defaults. Removed unimportant filter types","Commit":"Fix","Important":"False"},{"Id":60,"GitPatchModelId":25,"Name":"Database Fixes","Description":"Various fixes to bad data. Added some missing entities","Commit":"Fix","Important":"False"},{"Id":61,"GitPatchModelId":25,"Name":"Plain View","Description":"Database can now change to plain view for easy copy and pasting","Commit":"Feature","Important":"False"},{"Id":62,"GitPatchModelId":25,"Name":"Direct Links","Description":"Database now supports direct links. database/Throne to see just Throne","Commit":"Feature","Important":"False"},{"Id":63,"GitPatchModelId":26,"Name":"Better Navigation","Description":"Documentational pages now use a more logical navigation format, with sections, and parent-child documents","Commit":"Feature","Important":"False"},{"Id":64,"GitPatchModelId":26,"Name":"Style Improvements","Description":"Improved home page styling on website highlighted content","Commit":"Style","Important":"False"},{"Id":65,"GitPatchModelId":26,"Name":"Warning Cleanup","Description":"Removed a bunch of development code warnings","Commit":"Chore","Important":"False"},{"Id":66,"GitPatchModelId":27,"Name":"Toasts","Description":"Added some error toasts to build calculator. Needs work","Commit":"Feature","Important":"False"},{"Id":67,"GitPatchModelId":27,"Name":"Localization Text","Description":"Added localization logic for handling some text. Currently only supporting English","Commit":"Feature","Important":"False"},{"Id":68,"GitPatchModelId":27,"Name":"GitHub Button","Description":"Harass Calculator now links to code in repo, instead of showing it as text","Commit":"Feature","Important":"False"}]
\ No newline at end of file
diff --git a/IGP/wwwroot/generated/GitPatchModels.json b/IGP/wwwroot/generated/GitPatchModels.json
index c671fc9..547a2d7 100644
--- a/IGP/wwwroot/generated/GitPatchModels.json
+++ b/IGP/wwwroot/generated/GitPatchModels.json
@@ -1 +1 @@
-[{"Id":1,"Name":"Database UX Patch","Date":"2022-03-13T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":2,"Name":"Thrum Stats Hotfix","Date":"2022-03-12T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":3,"Name":"Memory Tester Patch","Date":"2022-03-01T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":4,"Name":"Hide Pyre Hotfix","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":5,"Name":"Stream Patch","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":6,"Name":"Agile UI Hotfix","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":7,"Name":"Armor Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":8,"Name":"Home Page Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":9,"Name":"Mobile Menu Hotfix 2","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":10,"Name":"Mobile Menu Hotfix","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":11,"Name":"Mobile Menu Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":12,"Name":"0.0.6.8375a Patch","Date":"2022-02-18T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":13,"Name":"Google Tracking Hotfix","Date":"2022-02-18T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":14,"Name":"Privacy Policy Patch","Date":"2022-02-17T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":15,"Name":"Home Page Quick Hotfix","Date":"2022-02-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":16,"Name":"Early Agile Patch","Date":"2022-02-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":17,"Name":"Form Text Rendering Hotfix","Date":"2022-02-15T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":18,"Name":"Reducing Timing Interval Hotfix","Date":"2022-02-15T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":19,"Name":"Changelog Patch","Date":"2022-02-14T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":20,"Name":"SQL Patch","Date":"2022-03-26T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":21,"Name":"Stream Patch","Date":"2022-03-30T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":22,"Name":"0.0.6.8900a Patch","Date":"2022-03-30T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":23,"Name":"Database Links Patch","Date":"2022-04-01T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":24,"Name":"Open Source Patch","Date":"2022-04-03T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":25,"Name":"Stream Patch","Date":"2022-04-03T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":26,"Name":"Notes/Docs Patch","Date":"2022-04-10T00:00:00","GitChangeModels":[],"Important":"False"}]
\ No newline at end of file
+[{"Id":1,"Name":"Database UX Patch","Date":"2022-03-13T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":2,"Name":"Thrum Stats Hotfix","Date":"2022-03-12T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":3,"Name":"Memory Tester Patch","Date":"2022-03-01T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":4,"Name":"Hide Pyre Hotfix","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":5,"Name":"Stream Patch","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":6,"Name":"Agile UI Hotfix","Date":"2022-02-20T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":7,"Name":"Armor Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":8,"Name":"Home Page Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":9,"Name":"Mobile Menu Hotfix 2","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":10,"Name":"Mobile Menu Hotfix","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":11,"Name":"Mobile Menu Patch","Date":"2022-02-19T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":12,"Name":"0.0.6.8375a Patch","Date":"2022-02-18T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":13,"Name":"Google Tracking Hotfix","Date":"2022-02-18T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":14,"Name":"Privacy Policy Patch","Date":"2022-02-17T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":15,"Name":"Home Page Quick Hotfix","Date":"2022-02-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":16,"Name":"Early Agile Patch","Date":"2022-02-16T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":17,"Name":"Form Text Rendering Hotfix","Date":"2022-02-15T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":18,"Name":"Reducing Timing Interval Hotfix","Date":"2022-02-15T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":19,"Name":"Changelog Patch","Date":"2022-02-14T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":20,"Name":"SQL Patch","Date":"2022-03-26T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":21,"Name":"Stream Patch","Date":"2022-03-30T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":22,"Name":"0.0.6.8900a Patch","Date":"2022-03-30T00:00:00","GitChangeModels":[],"Important":"True"},{"Id":23,"Name":"Database Links Patch","Date":"2022-04-01T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":24,"Name":"Open Source Patch","Date":"2022-04-03T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":25,"Name":"Stream Patch","Date":"2022-04-03T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":26,"Name":"Notes/Docs Patch","Date":"2022-04-10T00:00:00","GitChangeModels":[],"Important":"False"},{"Id":27,"Name":"Stream Patch","Date":"2022-04-10T00:00:00","GitChangeModels":[],"Important":"False"}]
\ No newline at end of file
diff --git a/IGP/wwwroot/index.html b/IGP/wwwroot/index.html
index 4ed83b7..1b1f7ad 100644
--- a/IGP/wwwroot/index.html
+++ b/IGP/wwwroot/index.html
@@ -17,7 +17,7 @@
 <div id="app">
     <div style="width: 100vw; height: 100vh; background-color: black;"></div>
 </div>
-<script src="_framework/blazor.webassembly.js" autostart="false"></script>
+<script autostart="false" src="_framework/blazor.webassembly.js"></script>
 <script crossorigin="anonymous"
         integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj"
         src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.slim.min.js"></script>
diff --git a/Model/Entity/EntityModel.cs b/Model/Entity/EntityModel.cs
index e4b07c8..72dcf05 100644
--- a/Model/Entity/EntityModel.cs
+++ b/Model/Entity/EntityModel.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Model.Entity.Data;
@@ -12,19 +13,15 @@ public class EntityModel
 {
     public static readonly string GameVersion = "0.0.6.8900a";
 
-    private static Dictionary<string, EntityModel> _database;
+    private static Dictionary<string, EntityModel> _database= null!;
 
-    private static List<EntityModel> entityModels;
+    private static List<EntityModel> _entityModels= null!;
 
-    private static List<EntityModel> entityModelsOnlyHotkey;
+    private static List<EntityModel> _entityModelsOnlyHotkey = null!;
 
-    private static Dictionary<string, List<EntityModel>> entityModelsByHotkey;
+    private static Dictionary<string, List<EntityModel>> _entityModelsByHotkey= null!;
 
 
-    public EntityModel()
-    {
-    }
-
     public EntityModel(string data, string entity, bool isSpeculative = false)
     {
         DataType = data;
@@ -90,57 +87,59 @@ public class EntityModel
 
     public static List<EntityModel> GetList()
     {
-        if (entityModels == null) entityModels = DATA.Get().Values.ToList();
+        if (_entityModels == null) _entityModels = DATA.Get().Values.ToList();
 
-        return entityModels;
+        return _entityModels;
     }
 
 
     public static List<EntityModel> GetListOnlyHotkey()
     {
-        if (entityModelsOnlyHotkey == null)
+        if (_entityModelsOnlyHotkey == null)
         {
-            entityModelsOnlyHotkey = new List<EntityModel>();
+            _entityModelsOnlyHotkey = new List<EntityModel>();
 
             foreach (var entity in DATA.Get().Values)
                 if (entity.Hotkey() != null)
-                    entityModelsOnlyHotkey.Add(entity);
+                    _entityModelsOnlyHotkey.Add(entity);
         }
 
-        return entityModelsOnlyHotkey;
+        return _entityModelsOnlyHotkey;
     }
 
 
     public static Dictionary<string, List<EntityModel>> GetEntitiesByHotkey()
     {
-        if (entityModelsByHotkey == null)
+        if (_entityModelsByHotkey == null)
         {
-            entityModelsByHotkey = new Dictionary<string, List<EntityModel>>();
+            _entityModelsByHotkey = new Dictionary<string, List<EntityModel>>();
 
             foreach (var entity in GetList())
             {
                 var entityHotkey = entity.Hotkey();
                 if (entityHotkey != null)
                 {
-                    if (!entityModelsByHotkey.ContainsKey(entityHotkey.Hotkey))
-                        entityModelsByHotkey[entityHotkey.Hotkey] = new List<EntityModel>();
+                    if (!_entityModelsByHotkey.ContainsKey(entityHotkey.Hotkey))
+                        _entityModelsByHotkey[entityHotkey.Hotkey] = new List<EntityModel>();
 
-                    entityModelsByHotkey[entityHotkey.Hotkey].Add(entity);
+                    _entityModelsByHotkey[entityHotkey.Hotkey].Add(entity);
                 }
             }
         }
 
 
-        return entityModelsByHotkey;
+        return _entityModelsByHotkey;
     }
 
 
-    public static EntityModel GetFrom(string hotkey, string hotkeyGroup, bool holdSpace, string faction,
+    public static EntityModel? GetFrom(string hotkey, string hotkeyGroup, bool holdSpace, string faction,
         string immortal)
     {
-        if (hotkey == null || hotkey == "") return null;
+        if (string.IsNullOrEmpty(hotkey)) return null;
 
-        //TODO
+        if (!GetEntitiesByHotkey().ContainsKey(hotkey)) return null;
+        
+        
         var foundList = from entity in GetEntitiesByHotkey()[hotkey]
             where entity.Hotkey()?.HotkeyGroup == hotkeyGroup
                   && entity.Hotkey()?.HoldSpace == holdSpace
@@ -151,7 +150,7 @@ public class EntityModel
                       select replace).ToList().Count == 0)
             select entity;
 
-        if (foundList == null || foundList.Count() == 0) return null;
+        if (foundList != null && !foundList.Any()) return null;
 
         var found = foundList.First();
 
diff --git a/Model/Git/CommitType.cs b/Model/Git/CommitType.cs
index 2fde070..17b569c 100644
--- a/Model/Git/CommitType.cs
+++ b/Model/Git/CommitType.cs
@@ -1,4 +1,4 @@
-namespace Model.Development.Git;
+namespace Model.Git;
 
 public class CommitType
 {
diff --git a/Model/Git/GitChangeModel.cs b/Model/Git/GitChangeModel.cs
index 1e34a20..e8f5d99 100644
--- a/Model/Git/GitChangeModel.cs
+++ b/Model/Git/GitChangeModel.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Model.Development.Git;
+namespace Model.Git;
 
 public class GitChangeModel
 {
@@ -9,6 +9,5 @@ public class GitChangeModel
     public string Name { get; set; } = "Add name...";
     public string Description { get; set; } = "Add desciption...";
     public string Commit { get; set; } = CommitType.Feature;
-    public DateTime Date { get; set; } = DateTime.Now;
     public string Important { get; set; } = "False";
 }
\ No newline at end of file
diff --git a/Model/Git/GitPatchModel.cs b/Model/Git/GitPatchModel.cs
index a94f9b3..ebadb6f 100644
--- a/Model/Git/GitPatchModel.cs
+++ b/Model/Git/GitPatchModel.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Model.Development.Git;
+namespace Model.Git;
 
 public class GitPatchModel
 {
diff --git a/Services/Development/GitService.cs b/Services/Development/GitService.cs
index 85f1a9c..51261cb 100644
--- a/Services/Development/GitService.cs
+++ b/Services/Development/GitService.cs
@@ -1,5 +1,5 @@
 using System.Net.Http.Json;
-using Model.Development.Git;
+using Model.Git;
 
 #if NO_SQL
 
diff --git a/Services/IServices.cs b/Services/IServices.cs
index 1396425..ba6bd89 100644
--- a/Services/IServices.cs
+++ b/Services/IServices.cs
@@ -14,7 +14,7 @@ using Model.MemoryTester;
 using Model.Notes;
 using Model.Website;
 using Model.Website.Enums;
-using Model.Development.Git;
+using Model.Git;
 using Model.Feedback;
 using Model.Work.Tasks;
 using Services.Immortal;
@@ -263,7 +263,7 @@ public interface IMemoryTesterService {
 }
 
 public interface IBuildOrderService {
-    public bool Add(EntityModel entity, IEconomyService withEconomy);
+    public bool Add(EntityModel entity, IEconomyService withEconomy, IToastService toastService);
     public void Add(EntityModel entity, int atInterval);
 
     public void SetName(string Name);
diff --git a/Services/Immortal/BuildOrderService.cs b/Services/Immortal/BuildOrderService.cs
index 8348370..fde9112 100644
--- a/Services/Immortal/BuildOrderService.cs
+++ b/Services/Immortal/BuildOrderService.cs
@@ -3,6 +3,7 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using Model.BuildOrders;
 using Model.Entity;
+using Model.Feedback;
 using Model.Types;
 using YamlDotNet.Serialization;
 
@@ -39,7 +40,7 @@ public class BuildOrderService : IBuildOrderService {
         if (atInterval > lastInterval) lastInterval = atInterval;
     }
 
-    public bool Add(EntityModel entity, IEconomyService withEconomy) {
+    public bool Add(EntityModel entity, IEconomyService withEconomy, IToastService withToasts) {
         if (entity != null) {
             var production = entity.Production();
 
@@ -49,7 +50,7 @@ public class BuildOrderService : IBuildOrderService {
                     if (economyAtSecond.Alloy >= production.Alloy && economyAtSecond.Ether >= production.Ether &&
                         economyAtSecond.Pyre >= production.Pyre) {
                         if (!MeetsSupply(entity)) {
-                            Console.WriteLine("More Supply Needed");
+                            withToasts.AddToast(new ToastModel {Title = "Supply Cap Reached", Message = "Build more supply!", SeverityType = SeverityType.Error});
                             return false;
                         }
 
@@ -68,6 +69,15 @@ public class BuildOrderService : IBuildOrderService {
                         NotifyDataChanged();
                         return true;
                     }
+                    else if(interval + 1 == withEconomy.GetOverTime().Count)
+                    {
+                        if (economyAtSecond.Ether < production.Ether)
+                        {
+                            withToasts.AddToast(new ToastModel {Title = "Not Enough Ether", Message = "Build more ether extractors!", SeverityType = SeverityType.Error});
+
+                        }
+                        
+                    }
                 }
             }
             else {
diff --git a/Services/Website/ToastService.cs b/Services/Website/ToastService.cs
index 122e84b..f6c1f8f 100644
--- a/Services/Website/ToastService.cs
+++ b/Services/Website/ToastService.cs
@@ -33,7 +33,8 @@ public class ToastService : IToastService
 
     public void AddToast(ToastModel toast)
     {
-        toasts.Add(toast);
+        toasts.Insert(0, toast);
+        
         NotifyDataChanged();
     }