diff --git a/Marechai/Controllers/HomeController.cs b/Marechai/Controllers/HomeController.cs
index 502d2d98..fc447923 100644
--- a/Marechai/Controllers/HomeController.cs
+++ b/Marechai/Controllers/HomeController.cs
@@ -47,8 +47,6 @@ namespace Marechai.Controllers
             _context           = context;
         }
 
-        public IActionResult About() => View();
-
         public IActionResult Contact() => View();
 
         public IActionResult Error() => View(new ErrorViewModel
diff --git a/Marechai/Marechai.csproj b/Marechai/Marechai.csproj
index 3f8620fe..280e5d3a 100644
--- a/Marechai/Marechai.csproj
+++ b/Marechai/Marechai.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>3.0.99.934</Version>
+    <Version>3.0.99.936</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>
@@ -54,8 +54,7 @@
     </Content>
     <Content Include="Areas\Identity\Pages\Account\LogOut.cshtml" />
     <Content Include="Areas\Identity\Pages\Shared\_LoginPartial.cshtml" />
-    <Content Include="Pages\Error.razor" />
-    <Content Include="Pages\Home\Index.razor" />
+    <Content Include="Pages\**\*.razor" />
     <Content Include="Pages\_Host.cshtml" />
     <Content Include="Shared\LoginDisplay.razor" />
     <Content Include="Shared\MainLayout.razor" />
diff --git a/Marechai/Views/Home/About.cshtml b/Marechai/Pages/Home/About.razor
similarity index 94%
rename from Marechai/Views/Home/About.cshtml
rename to Marechai/Pages/Home/About.razor
index f97aa4c3..5d586463 100644
--- a/Marechai/Views/Home/About.cshtml
+++ b/Marechai/Pages/Home/About.razor
@@ -1,9 +1,9 @@
-@{
-    /******************************************************************************
+@{
+/******************************************************************************
 // MARECHAI: Master repository of computing history artifacts information
 // ----------------------------------------------------------------------------
 //
-// Filename       : About.cshtml
+// Filename       : About.razor
 // Author(s)      : Natalia Portillo <claunia@claunia.com>
 //
 // --[ Description ] ----------------------------------------------------------
@@ -28,10 +28,9 @@
 // ----------------------------------------------------------------------------
 // Copyright © 2003-2020 Natalia Portillo
 *******************************************************************************/
-
-    ViewData["Title"] = "About";
 }
-<h2>@ViewData["Title"]</h2>
+@page "/about"
+<h2>About</h2>
 <h4>Who are we</h4>
 <p>We are a non-profit organization with the goal of conserve and restore old computers, video-consoles and arcade machines as well as to expose these machines in an office disposed for that purpose with information about computing history.</p>
 <h4>Where are we</h4>
diff --git a/Marechai/Shared/MainLayout.razor b/Marechai/Shared/MainLayout.razor
index f9ed0564..305b220c 100644
--- a/Marechai/Shared/MainLayout.razor
+++ b/Marechai/Shared/MainLayout.razor
@@ -8,7 +8,7 @@
 <div class="main">
     <div class="top-row px-4 auth">
         <LoginDisplay/>
-        <a href="https://docs.microsoft.com/aspnet/" target="_blank">@L["About"]</a>
+        <a href="/about" target="_blank">@L["About"]</a>
     </div>
 
     <div class="content px-4">