diff --git a/SAP1EMU.GUI/Views/Docs/_DocNav.cshtml b/SAP1EMU.GUI/Views/Docs/_DocNav.cshtml
index 025ed29f..b28379ca 100644
--- a/SAP1EMU.GUI/Views/Docs/_DocNav.cshtml
+++ b/SAP1EMU.GUI/Views/Docs/_DocNav.cshtml
@@ -9,7 +9,7 @@
             <p class="card-text">
                 Explore the architecture and design of the SAP1 Computer.
             </p>
-            <button class="btn btn-secondary" disabled>Learn More</button>
+            <a class="btn btn-secondary" disabled>Learn More</a>
         </div>
     </div>
     <div class="card">
@@ -22,7 +22,7 @@
             <p class="card-text">
                 How are 8-Bit Computers similar and different from out modern computers?
             </p>
-            <button class="btn btn-secondary" disabled>Learn More</button>
+            <a class="btn btn-secondary" disabled>Learn More</a>
         </div>
     </div>
     <div class="card">
@@ -35,7 +35,7 @@
             <p class="card-text">
                 Find other great learning resources.
             </p>
-            <button class="btn btn-secondary" disabled>Learn More</button>
+            <a class="btn btn-secondary" disabled>Learn More</a>
         </div>
     </div>
     <div class="card">
@@ -48,7 +48,7 @@
             <p class="card-text">
                 Write your first program and learn about different Instruction Sets.
             </p>
-            <button class="btn btn-primary" onclick="location.href='@Url.Action("EightBitProgramming_1", "Docs")'">Learn More</button>
+            <a class="btn btn-primary" asp-area="" asp-controller="Docs" asp-action="EightBitProgramming_1">Learn More</a>
         </div>
     </div>
     <div class="card">
@@ -61,7 +61,7 @@
             <p class="card-text">
                 Learn the basics of low level languages, like ARM, and how they relate to 8-Bit Computers.
             </p>
-            <button class="btn btn-secondary" onclick="location.href='@Url.Action("LowLevelLanguages_1", "Docs")'" disabled>Learn More</button>
+            <a class="btn btn-secondary" asp-area="" asp-controller="Docs" asp-action="LowLevelLanguages_1" disabled>Learn More</a>
         </div>
     </div>
     <div class="card">
@@ -74,7 +74,7 @@
             <p class="card-text">
                 Learn the basics of how high level languages work and why developers prefer them over low level languages.
             </p>
-            <button class="btn btn-secondary" disabled>Learn More</button>
+            <a class="btn btn-secondary" disabled>Learn More</a>
         </div>
     </div>
     <div class="card">
@@ -87,7 +87,7 @@
             <p class="card-text">
                 Prefer to user our command line interface?
             </p>
-            <button class="btn btn-secondary" disabled>Learn More</button>
+            <a class="btn btn-secondary" disabled>Learn More</a>
         </div>
     </div>
     <div class="card">
@@ -100,7 +100,7 @@
             <p class="card-text">
                 Want to integrate your app directly to our API?
             </p>
-            <button class="btn btn-primary" onclick="location.href='@Url.Action("APIDocs_1", "Docs")'">Learn More</button>
+            <a class="btn btn-primary" asp-area="" asp-controller="Docs" asp-action="APIDocs_1">Learn More</a>
         </div>
     </div>
     <div class="card">
@@ -113,7 +113,7 @@
             <p class="card-text">
                 Want to use our C# .Net Core Library?
             </p>
-            <button class="btn btn-secondary" disabled>Learn More</button>
+            <a class="btn btn-secondary" disabled>Learn More</a>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git a/SAP1EMU.GUI/Views/Docs/_PageNavHelper.cshtml b/SAP1EMU.GUI/Views/Docs/_PageNavHelper.cshtml
index c0c37717..fcf309be 100644
--- a/SAP1EMU.GUI/Views/Docs/_PageNavHelper.cshtml
+++ b/SAP1EMU.GUI/Views/Docs/_PageNavHelper.cshtml
@@ -5,7 +5,7 @@
         @{
             if (!String.IsNullOrEmpty(Model.PreviousView))
             {
-                <button class="btn btn-primary" onclick="location.href='@Url.Action(Model.PreviousView, Model.ControllerName)'">Previous - @Model.PreviousViewDisplay</button>
+                <a class="btn btn-primary" asp-area="" asp-controller="@Model.ControllerName" asp-action="@Model.PreviousView">Previous - @Model.PreviousViewDisplay</a>
             }
         }
     </div>
@@ -16,11 +16,11 @@
             {
                 if (Model.IsNewChapter)
                 {
-                    <button class="btn btn-danger" onclick="location.href='@Url.Action(Model.NextView, Model.ControllerName)'">Next - @Model.NextViewDisplay</button>
+                    <a class="btn btn-danger" asp-area="" asp-controller="@Model.ControllerName" asp-action="@Model.NextView">Next - @Model.NextViewDisplay</a>
                 }
                 else
                 {
-                    <button class="btn btn-primary" onclick="location.href='@Url.Action(Model.NextView, Model.ControllerName)'">Next - @Model.NextViewDisplay</button>
+                    <a class="btn btn-primary"  asp-area="" asp-controller="@Model.ControllerName" asp-action="@Model.NextView">Next - @Model.NextViewDisplay</a>
                 }
             }