diff --git a/Marechai/Controllers/HomeController.cs b/Marechai/Controllers/HomeController.cs
deleted file mode 100644
index fc447923..00000000
--- a/Marechai/Controllers/HomeController.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-/******************************************************************************
-// MARECHAI: Master repository of computing history artifacts information
-// ----------------------------------------------------------------------------
-//
-// Filename       : HomeController.cs
-// Author(s)      : Natalia Portillo <claunia@claunia.com>
-//
-// --[ Description ] ----------------------------------------------------------
-//
-//     Home controller
-//
-// --[ License ] --------------------------------------------------------------
-//
-//     This program is free software: you can redistribute it and/or modify
-//     it under the terms of the GNU General Public License as
-//     published by the Free Software Foundation, either version 3 of the
-//     License, or (at your option) any later version.
-//
-//     This program is distributed in the hope that it will be useful,
-//     but WITHOUT ANY WARRANTY; without even the implied warranty of
-//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//     GNU General Public License for more details.
-//
-//     You should have received a copy of the GNU General Public License
-//     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-// ----------------------------------------------------------------------------
-// Copyright © 2003-2020 Natalia Portillo
-*******************************************************************************/
-
-using System.Diagnostics;
-using Marechai.Database.Models;
-using Marechai.Models;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Marechai.Controllers
-{
-    public class HomeController : Controller
-    {
-        readonly MarechaiContext     _context;
-        readonly IWebHostEnvironment hostingEnvironment;
-
-        public HomeController(IWebHostEnvironment env, MarechaiContext context)
-        {
-            hostingEnvironment = env;
-            _context           = context;
-        }
-
-        public IActionResult Contact() => View();
-
-        public IActionResult Error() => View(new ErrorViewModel
-        {
-            RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier
-        });
-    }
-}
\ No newline at end of file
diff --git a/Marechai/Marechai.csproj b/Marechai/Marechai.csproj
index 280e5d3a..39099e4d 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.936</Version>
+    <Version>3.0.99.937</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2020 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>
diff --git a/Marechai/Views/Home/Contact.cshtml b/Marechai/Pages/Home/Contact.razor
similarity index 88%
rename from Marechai/Views/Home/Contact.cshtml
rename to Marechai/Pages/Home/Contact.razor
index 6383d084..4da081bb 100644
--- a/Marechai/Views/Home/Contact.cshtml
+++ b/Marechai/Pages/Home/Contact.razor
@@ -1,9 +1,9 @@
-@{
-    /******************************************************************************
+@{
+/******************************************************************************
 // MARECHAI: Master repository of computing history artifacts information
 // ----------------------------------------------------------------------------
 //
-// Filename       : Contact.cshtml
+// Filename       : Contact.razor
 // Author(s)      : Natalia Portillo <claunia@claunia.com>
 //
 // --[ Description ] ----------------------------------------------------------
@@ -28,10 +28,10 @@
 // ----------------------------------------------------------------------------
 // Copyright © 2003-2020 Natalia Portillo
 *******************************************************************************/
-
-    ViewData["Title"] = "Contact";
 }
-<h2>@ViewData["Title"]</h2>
+
+@page "/contact"
+<h2>Contact</h2>
 <address>
     <strong>Support:</strong>
     <a href="mailto:museum@claunia.com">
diff --git a/Marechai/Resources/Shared/NavMenu.es.resx b/Marechai/Resources/Shared/NavMenu.es.resx
index 386abba1..4bbf9e18 100644
--- a/Marechai/Resources/Shared/NavMenu.es.resx
+++ b/Marechai/Resources/Shared/NavMenu.es.resx
@@ -142,4 +142,8 @@
     <value>Acerca de</value>
     <comment>About</comment>
   </data>
+  <data name="Contact" xml:space="preserve">
+    <value>Contacto</value>
+    <comment>Contact</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Marechai/Shared/MainLayout.razor b/Marechai/Shared/MainLayout.razor
index 305b220c..d2d22781 100644
--- a/Marechai/Shared/MainLayout.razor
+++ b/Marechai/Shared/MainLayout.razor
@@ -9,6 +9,7 @@
     <div class="top-row px-4 auth">
         <LoginDisplay/>
         <a href="/about" target="_blank">@L["About"]</a>
+        <a href="/contact" target="_blank">@L["Contact"]</a>
     </div>
 
     <div class="content px-4">