diff --git a/cicm_web/Areas/Identity/IdentityHostingStartup.cs b/cicm_web/Areas/Identity/IdentityHostingStartup.cs
index 16222e02..9911c64e 100644
--- a/cicm_web/Areas/Identity/IdentityHostingStartup.cs
+++ b/cicm_web/Areas/Identity/IdentityHostingStartup.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
@@ -28,8 +28,12 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 
+using Cicm.Database.Models;
 using cicm_web.Areas.Identity;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 
 [assembly: HostingStartup(typeof(IdentityHostingStartup))]
 
@@ -39,7 +43,15 @@ namespace cicm_web.Areas.Identity
     {
         public void Configure(IWebHostBuilder builder)
         {
-            builder.ConfigureServices((context, services) => { });
+            builder.ConfigureServices((context, services) =>
+            {
+                services.AddDbContext<cicmContext>(options => options
+                                                             .UseLazyLoadingProxies()
+                                                             .UseMySql("server=localhost;port=3306;user=cicm;password=cicmpass;database=cicm"));
+
+                services.AddDefaultIdentity<IdentityUser>().AddRoles<IdentityRole>()
+                        .AddEntityFrameworkStores<cicmContext>();
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/AccessDenied.cshtml b/cicm_web/Areas/Identity/Pages/Account/AccessDenied.cshtml
index 236ac9dd..27b60c7b 100644
--- a/cicm_web/Areas/Identity/Pages/Account/AccessDenied.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/AccessDenied.cshtml
@@ -38,4 +38,4 @@
 <header>
     <h1 class="text-danger">@ViewData["Title"]</h1>
     <p class="text-danger">You do not have access to this resource.</p>
-</header>
+</header>
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
index 98d71c57..b54fec02 100644
--- a/cicm_web/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml b/cicm_web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
index c529d5f3..bd58c3ee 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
@@ -35,9 +35,9 @@
     ViewData["Title"] = "Confirm email";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <div>
     <p>
         Thank you for confirming your email.
     </p>
-</div>
+</div>
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs
index 4a2dedff..f0642021 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/ExternalLogin.cshtml b/cicm_web/Areas/Identity/Pages/Account/ExternalLogin.cshtml
index 9bdc4f23..03b471c3 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ExternalLogin.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/ExternalLogin.cshtml
@@ -35,7 +35,7 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <h4>Associate your @Model.LoginProvider account.</h4>
 <hr />
 
@@ -47,19 +47,28 @@
 
 <div class="row">
     <div class="col-md-4">
-        <form asp-page-handler="Confirmation" asp-route-returnUrl="@Model.ReturnUrl" method="post">
-            <div asp-validation-summary="All" class="text-danger"></div>
+        <form asp-page-handler="Confirmation"
+              asp-route-returnUrl="@Model.ReturnUrl"
+              method="post">
+            <div asp-validation-summary="All"
+                 class="text-danger">
+            </div>
             <div class="form-group">
                 <label asp-for="Input.Email"></label>
-                <input asp-for="Input.Email" class="form-control" />
-                <span asp-validation-for="Input.Email" class="text-danger"></span>
+                <input asp-for="Input.Email"
+                       class="form-control" />
+                <span asp-validation-for="Input.Email"
+                      class="text-danger">
+                </span>
             </div>
-            <button type="submit" class="btn btn-default">Register</button>
+            <button class="btn btn-primary"
+                    type="submit">
+                Register
+            </button>
         </form>
     </div>
 </div>
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
-}
-
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
index f9d4ad88..4652f6f1 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/ForgotPassword.cshtml b/cicm_web/Areas/Identity/Pages/Account/ForgotPassword.cshtml
index f67cb9ec..121bedf8 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ForgotPassword.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/ForgotPassword.cshtml
@@ -35,23 +35,31 @@
     ViewData["Title"] = "Forgot your password?";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <h4>Enter your email.</h4>
 <hr />
 <div class="row">
     <div class="col-md-4">
         <form method="post">
-            <div asp-validation-summary="All" class="text-danger"></div>
+            <div asp-validation-summary="All"
+                 class="text-danger">
+            </div>
             <div class="form-group">
                 <label asp-for="Input.Email"></label>
-                <input asp-for="Input.Email" class="form-control" />
-                <span asp-validation-for="Input.Email" class="text-danger"></span>
+                <input asp-for="Input.Email"
+                       class="form-control" />
+                <span asp-validation-for="Input.Email"
+                      class="text-danger">
+                </span>
             </div>
-            <button type="submit" class="btn btn-default">Submit</button>
+            <button class="btn btn-primary"
+                    type="submit">
+                Submit
+            </button>
         </form>
     </div>
 </div>
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
index e77eae75..593c752a 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
@@ -56,24 +56,22 @@ namespace cicm_web.Areas.Identity.Pages.Account
 
         public async Task<IActionResult> OnPostAsync()
         {
-            if(ModelState.IsValid)
-            {
-                IdentityUser user = await _userManager.FindByEmailAsync(Input.Email);
-                if(user == null || !await _userManager.IsEmailConfirmedAsync(user))
-                    return RedirectToPage("./ForgotPasswordConfirmation");
-
-                // For more information on how to enable account confirmation and password reset please 
-                // visit https://go.microsoft.com/fwlink/?LinkID=532713
-                string code        = await _userManager.GeneratePasswordResetTokenAsync(user);
-                string callbackUrl = Url.Page("/Account/ResetPassword", null, new {code}, Request.Scheme);
-
-                await _emailSender.SendEmailAsync(Input.Email, "Reset Password",
-                                                  $"Please reset your password by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
+            if(!ModelState.IsValid) return Page();
 
+            IdentityUser user = await _userManager.FindByEmailAsync(Input.Email);
+            if(user == null || !await _userManager.IsEmailConfirmedAsync(user))
+                // Don't reveal that the user does not exist or is not confirmed
                 return RedirectToPage("./ForgotPasswordConfirmation");
-            }
 
-            return Page();
+            // For more information on how to enable account confirmation and password reset please 
+            // visit https://go.microsoft.com/fwlink/?LinkID=532713
+            string code        = await _userManager.GeneratePasswordResetTokenAsync(user);
+            string callbackUrl = Url.Page("/Account/ResetPassword", null, new {code}, Request.Scheme);
+
+            await _emailSender.SendEmailAsync(Input.Email, "Reset Password",
+                                              $"Please reset your password by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
+
+            return RedirectToPage("./ForgotPasswordConfirmation");
         }
 
         public class InputModel
diff --git a/cicm_web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml b/cicm_web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml
index 3c750220..7287b29e 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml
@@ -35,8 +35,7 @@
     ViewData["Title"] = "Forgot password confirmation";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <p>
     Please check your email to reset your password.
-</p>
-
+</p>
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
index 297db5e0..b684fdd5 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Lockout.cshtml b/cicm_web/Areas/Identity/Pages/Account/Lockout.cshtml
index cddca71f..c49b50ca 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Lockout.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Lockout.cshtml
@@ -38,4 +38,4 @@
 <header>
     <h1 class="text-danger">@ViewData["Title"]</h1>
     <p class="text-danger">This account has been locked out, please try again later.</p>
-</header>
+</header>
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Lockout.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Lockout.cshtml.cs
index 01710541..74374a3e 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Lockout.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Lockout.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Login.cshtml b/cicm_web/Areas/Identity/Pages/Account/Login.cshtml
index c36425d6..9fa347d6 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Login.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Login.cshtml
@@ -30,29 +30,39 @@
 *******************************************************************************/
 }
 @page
+@using Microsoft.AspNetCore.Authentication
 @model LoginModel
 
 @{
     ViewData["Title"] = "Log in";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <div class="row">
     <div class="col-md-4">
         <section>
-            <form method="post">
+            <form id="account"
+                  method="post">
                 <h4>Use a local account to log in.</h4>
                 <hr />
-                <div asp-validation-summary="All" class="text-danger"></div>
+                <div asp-validation-summary="All"
+                     class="text-danger">
+                </div>
                 <div class="form-group">
                     <label asp-for="Input.Email"></label>
-                    <input asp-for="Input.Email" class="form-control" />
-                    <span asp-validation-for="Input.Email" class="text-danger"></span>
+                    <input asp-for="Input.Email"
+                           class="form-control" />
+                    <span asp-validation-for="Input.Email"
+                          class="text-danger">
+                    </span>
                 </div>
                 <div class="form-group">
                     <label asp-for="Input.Password"></label>
-                    <input asp-for="Input.Password" class="form-control" />
-                    <span asp-validation-for="Input.Password" class="text-danger"></span>
+                    <input asp-for="Input.Password"
+                           class="form-control" />
+                    <span asp-validation-for="Input.Password"
+                          class="text-danger">
+                    </span>
                 </div>
                 <div class="form-group">
                     <div class="checkbox">
@@ -63,14 +73,23 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <button type="submit" class="btn btn-default">Log in</button>
+                    <button class="btn btn-primary"
+                            type="submit">
+                        Log in
+                    </button>
                 </div>
                 <div class="form-group">
                     <p>
-                        <a asp-page="./ForgotPassword">Forgot your password?</a>
+                        <a asp-page="./ForgotPassword"
+                           id="forgot-password">
+                            Forgot your password?
+                        </a>
                     </p>
                     <p>
-                        <a asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Register as a new user</a>
+                        <a asp-page="./Register"
+                           asp-route-returnUrl="@Model.ReturnUrl">
+                            Register as a new user
+                        </a>
                     </p>
                 </div>
             </form>
@@ -81,7 +100,7 @@
             <h4>Use another service to log in.</h4>
             <hr />
             @{
-                if ((Model.ExternalLogins?.Count ?? 0) == 0)
+                if((Model.ExternalLogins?.Count ?? 0) == 0)
                 {
                     <div>
                         <p>
@@ -92,12 +111,21 @@
                 }
                 else
                 {
-                    <form asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
+                    <form id="external-account"
+                          asp-page="./ExternalLogin"
+                          asp-route-returnUrl="@Model.ReturnUrl"
+                          method="post"
+                          class="form-horizontal">
                         <div>
                             <p>
-                                @foreach (var provider in Model.ExternalLogins)
+                                @foreach(AuthenticationScheme provider in Model.ExternalLogins)
                                 {
-                                    <button type="submit" class="btn btn-default" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
+                                    <button type="submit"
+                                            class="btn btn-primary"
+                                            name="provider"
+                                            value="@provider.Name"
+                                            title="Log in using your @provider.DisplayName account">
+                                        @provider.DisplayName</button>
                                 }
                             </p>
                         </div>
@@ -110,4 +138,4 @@
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Login.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Login.cshtml.cs
index d4d51e8d..318bdcb2 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Login.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Login.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml b/cicm_web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml
index 3354847d..ee3227e5 100644
--- a/cicm_web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml
@@ -35,18 +35,26 @@
     ViewData["Title"] = "Two-factor authentication";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <hr />
 <p>Your login is protected with an authenticator app. Enter your authenticator code below.</p>
 <div class="row">
     <div class="col-md-4">
-        <form method="post" asp-route-returnUrl="@Model.ReturnUrl">
-            <input asp-for="RememberMe" type="hidden" />
-            <div asp-validation-summary="All" class="text-danger"></div>
+        <form method="post"
+              asp-route-returnUrl="@Model.ReturnUrl">
+            <input asp-for="RememberMe"
+                   type="hidden" />
+            <div asp-validation-summary="All"
+                 class="text-danger">
+            </div>
             <div class="form-group">
                 <label asp-for="Input.TwoFactorCode"></label>
-                <input asp-for="Input.TwoFactorCode" class="form-control" autocomplete="off" />
-                <span asp-validation-for="Input.TwoFactorCode" class="text-danger"></span>
+                <input asp-for="Input.TwoFactorCode"
+                       class="form-control"
+                       autocomplete="off" />
+                <span asp-validation-for="Input.TwoFactorCode"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
                 <div class="checkbox">
@@ -57,14 +65,21 @@
                 </div>
             </div>
             <div class="form-group">
-                <button type="submit" class="btn btn-default">Log in</button>
+                <button class="btn btn-primary"
+                        type="submit">
+                    Log in
+                </button>
             </div>
         </form>
     </div>
 </div>
 <p>
-    Don't have access to your authenticator device? You can 
-    <a asp-page="./LoginWithRecoveryCode" asp-route-returnUrl="@Model.ReturnUrl">log in with a recovery code</a>.
+    Don't have access to your authenticator device? You can
+    <a id="recovery-code-login"
+       asp-page="./LoginWithRecoveryCode"
+       asp-route-returnUrl="@Model.ReturnUrl">
+        log in with a recovery code
+    </a>.
 </p>
 
 @section Scripts {
diff --git a/cicm_web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs
index 70826d31..de69bce0 100644
--- a/cicm_web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
@@ -64,7 +64,7 @@ namespace cicm_web.Areas.Identity.Pages.Account
             // Ensure the user has gone through the username & password screen first
             IdentityUser user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
 
-            if(user == null) throw new InvalidOperationException($"Unable to load two-factor authentication user.");
+            if(user == null) throw new InvalidOperationException("Unable to load two-factor authentication user.");
 
             ReturnUrl  = returnUrl;
             RememberMe = rememberMe;
@@ -79,7 +79,7 @@ namespace cicm_web.Areas.Identity.Pages.Account
             returnUrl = returnUrl ?? Url.Content("~/");
 
             IdentityUser user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
-            if(user == null) throw new InvalidOperationException($"Unable to load two-factor authentication user.");
+            if(user == null) throw new InvalidOperationException("Unable to load two-factor authentication user.");
 
             string authenticatorCode = Input.TwoFactorCode.Replace(" ", string.Empty).Replace("-", string.Empty);
 
diff --git a/cicm_web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml b/cicm_web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml
index 2fddefcc..7cd4d3fa 100644
--- a/cicm_web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml
@@ -35,7 +35,7 @@
     ViewData["Title"] = "Recovery code verification";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <hr />
 <p>
     You have requested to log in with a recovery code. This login will not be remembered until you provide
@@ -44,17 +44,26 @@
 <div class="row">
     <div class="col-md-4">
         <form method="post">
-            <div asp-validation-summary="All" class="text-danger"></div>
+            <div asp-validation-summary="All"
+                 class="text-danger">
+            </div>
             <div class="form-group">
                 <label asp-for="Input.RecoveryCode"></label>
-                <input asp-for="Input.RecoveryCode" class="form-control" autocomplete="off" />
-                <span asp-validation-for="Input.RecoveryCode" class="text-danger"></span>
+                <input asp-for="Input.RecoveryCode"
+                       class="form-control"
+                       autocomplete="off" />
+                <span asp-validation-for="Input.RecoveryCode"
+                      class="text-danger">
+                </span>
             </div>
-            <button type="submit" class="btn btn-default">Log in</button>
+            <button class="btn btn-primary"
+                    type="submit">
+                Log in
+            </button>
         </form>
     </div>
 </div>
- 
- @section Scripts {
+
+@section Scripts {
     <partial name="_ValidationScriptsPartial" />
 }
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs
index d5e510b4..01908d25 100644
--- a/cicm_web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
@@ -62,7 +62,7 @@ namespace cicm_web.Areas.Identity.Pages.Account
         {
             // Ensure the user has gone through the username & password screen first
             IdentityUser user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
-            if(user == null) throw new InvalidOperationException($"Unable to load two-factor authentication user.");
+            if(user == null) throw new InvalidOperationException("Unable to load two-factor authentication user.");
 
             ReturnUrl = returnUrl;
 
@@ -74,7 +74,7 @@ namespace cicm_web.Areas.Identity.Pages.Account
             if(!ModelState.IsValid) return Page();
 
             IdentityUser user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
-            if(user == null) throw new InvalidOperationException($"Unable to load two-factor authentication user.");
+            if(user == null) throw new InvalidOperationException("Unable to load two-factor authentication user.");
 
             string recoveryCode = Input.RecoveryCode.Replace(" ", string.Empty);
 
diff --git a/cicm_web/Areas/Identity/Pages/Account/Logout.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Logout.cshtml.cs
index 8890a736..39bb3e76 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Logout.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Logout.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
index ff3d6295..479f4107 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
@@ -33,34 +33,51 @@
 @model ChangePasswordModel
 @{
     ViewData["Title"] = "Change password";
+    ViewData["ActivePage"] = ManageNavPages.ChangePassword;
 }
 
 <h4>@ViewData["Title"]</h4>
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial for="StatusMessage"
+         name="_StatusMessage" />
 <div class="row">
     <div class="col-md-6">
-        <form id="change-password-form" method="post">
-            <div asp-validation-summary="All" class="text-danger"></div>
+        <form id="change-password-form"
+              method="post">
+            <div asp-validation-summary="All"
+                 class="text-danger">
+            </div>
             <div class="form-group">
                 <label asp-for="Input.OldPassword"></label>
-                <input asp-for="Input.OldPassword" class="form-control" />
-                <span asp-validation-for="Input.OldPassword" class="text-danger"></span>
+                <input asp-for="Input.OldPassword"
+                       class="form-control" />
+                <span asp-validation-for="Input.OldPassword"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
                 <label asp-for="Input.NewPassword"></label>
-                <input asp-for="Input.NewPassword" class="form-control" />
-                <span asp-validation-for="Input.NewPassword" class="text-danger"></span>
+                <input asp-for="Input.NewPassword"
+                       class="form-control" />
+                <span asp-validation-for="Input.NewPassword"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
                 <label asp-for="Input.ConfirmPassword"></label>
-                <input asp-for="Input.ConfirmPassword" class="form-control" />
-                <span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
+                <input asp-for="Input.ConfirmPassword"
+                       class="form-control" />
+                <span asp-validation-for="Input.ConfirmPassword"
+                      class="text-danger">
+                </span>
             </div>
-            <button type="submit" class="btn btn-default">Update password</button>
+            <button class="btn btn-primary"
+                    type="submit">
+                Update password
+            </button>
         </form>
     </div>
 </div>
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs
index e6825386..5175213c 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml
index 3df6b23a..c1fc7e41 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml
@@ -33,12 +33,13 @@
 @model DeletePersonalDataModel
 @{
     ViewData["Title"] = "Delete Personal Data";
-    ViewData["ActivePage"] = ManageNavPages.DeletePersonalData;
+    ViewData["ActivePage"] = ManageNavPages.PersonalData;
 }
 
 <h4>@ViewData["Title"]</h4>
 
-<div class="alert alert-warning" role="alert">
+<div class="alert alert-warning"
+     role="alert">
     <p>
         <span class="glyphicon glyphicon-warning-sign"></span>
         <strong>Deleting this data will permanently remove your account, and this cannot be recovered.</strong>
@@ -46,20 +47,30 @@
 </div>
 
 <div>
-    <form id="delete-user" method="post" class="form-group">
-        <div asp-validation-summary="All" class="text-danger"></div>
-        @if (Model.RequirePassword)
-        {
-        <div class="form-group">
-            <label asp-for="Input.Password"></label>
-            <input asp-for="Input.Password" class="form-control" />
-            <span asp-validation-for="Input.Password" class="text-danger"></span>
+    <form class="form-group"
+          id="delete-user"
+          method="post">
+        <div asp-validation-summary="All"
+             class="text-danger">
         </div>
+        @if(Model.RequirePassword)
+        {
+            <div class="form-group">
+                <label asp-for="Input.Password"></label>
+                <input asp-for="Input.Password"
+                       class="form-control" />
+                <span asp-validation-for="Input.Password"
+                      class="text-danger">
+                </span>
+            </div>
         }
-        <button class="btn btn-danger" type="submit">Delete data and close my account</button>
+        <button class="btn btn-danger"
+                type="submit">
+            Delete data and close my account
+        </button>
     </form>
 </div>
 
 @section Scripts {
-<partial name="_ValidationScriptsPartial" />
+    <partial name="_ValidationScriptsPartial" />
 }
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs
index b953ef9e..8cf36c33 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
index f2f34c5f..c055dc5f 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
@@ -36,10 +36,12 @@
     ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
-<h2>@ViewData["Title"]</h2>
+<partial for="StatusMessage"
+         name="_StatusMessage" />
+<h1>@ViewData["Title"]</h1>
 
-<div class="alert alert-warning" role="alert">
+<div class="alert alert-warning"
+     role="alert">
     <p>
         <span class="glyphicon glyphicon-warning-sign"></span>
         <strong>This action only disables 2FA.</strong>
@@ -51,7 +53,11 @@
 </div>
 
 <div>
-    <form method="post" class="form-group">
-        <button class="btn btn-danger" type="submit">Disable 2FA</button>
+    <form class="form-group"
+          method="post">
+        <button class="btn btn-danger"
+                type="submit">
+            Disable 2FA
+        </button>
     </form>
-</div>
+</div>
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs
index 05507175..4ef10973 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml
index 2179be24..add4c359 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml
@@ -33,7 +33,7 @@
 @model DownloadPersonalDataModel
 @{
     ViewData["Title"] = "Download Your Data";
-    ViewData["ActivePage"] = ManageNavPages.DownloadPersonalData;
+    ViewData["ActivePage"] = ManageNavPages.PersonalData;
 }
 
 <h4>@ViewData["Title"]</h4>
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs
index 4281ccf8..90841c15 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
index dfb4629d..4584d986 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
@@ -36,7 +36,8 @@
     ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial for="StatusMessage"
+         name="_StatusMessage" />
 <h4>@ViewData["Title"]</h4>
 <div>
     <p>To use an authenticator app go through the following steps:</p>
@@ -56,7 +57,9 @@
             <p>Scan the QR Code or enter this key <kbd>@Model.SharedKey</kbd> into your two factor authenticator app. Spaces and casing do not matter.</p>
             <div class="alert alert-info">To enable QR code generation please read our <a href="https://go.microsoft.com/fwlink/?Linkid=852423">documentation</a>.</div>
             <div id="qrCode"></div>
-            <div id="qrCodeData" data-url="@Html.Raw(Model.AuthenticatorUri)"></div>
+            <div id="qrCodeData"
+                 data-url="@Html.Raw(Model.AuthenticatorUri)">
+            </div>
         </li>
         <li>
             <p>
@@ -65,14 +68,27 @@
             </p>
             <div class="row">
                 <div class="col-md-6">
-                    <form method="post">
+                    <form id="send-code"
+                          method="post">
                         <div class="form-group">
-                            <label asp-for="Input.Code" class="control-label">Verification Code</label>
-                            <input asp-for="Input.Code" class="form-control" autocomplete="off" />
-                            <span asp-validation-for="Input.Code" class="text-danger"></span>
+                            <label asp-for="Input.Code"
+                                   class="control-label">
+                                Verification Code
+                            </label>
+                            <input asp-for="Input.Code"
+                                   class="form-control"
+                                   autocomplete="off" />
+                            <span asp-validation-for="Input.Code"
+                                  class="text-danger">
+                            </span>
+                        </div>
+                        <button class="btn btn-primary"
+                                type="submit">
+                            Verify
+                        </button>
+                        <div asp-validation-summary="ModelOnly"
+                             class="text-danger">
                         </div>
-                        <button type="submit" class="btn btn-default">Verify</button>
-                        <div asp-validation-summary="ModelOnly" class="text-danger"></div>
                     </form>
                 </div>
             </div>
@@ -82,4 +98,4 @@
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
index 2206f3b3..b315c473 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
@@ -153,11 +153,9 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
             return result.ToString().ToLowerInvariant();
         }
 
-        string GenerateQrCodeUri(string email, string unformattedKey)
-        {
-            return string.Format(AuthenticatorUriFormat, _urlEncoder.Encode("cicm_web"), _urlEncoder.Encode(email),
-                                 unformattedKey);
-        }
+        string GenerateQrCodeUri(string email, string unformattedKey) =>
+            string.Format(AuthenticatorUriFormat, _urlEncoder.Encode("cicm_web"), _urlEncoder.Encode(email),
+                          unformattedKey);
 
         public class InputModel
         {
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
index c7570218..0e7bf109 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
@@ -30,54 +30,76 @@
 *******************************************************************************/
 }
 @page
+@using Microsoft.AspNetCore.Authentication
 @model ExternalLoginsModel
 @{
     ViewData["Title"] = "Manage your external logins";
+    ViewData["ActivePage"] = ManageNavPages.ExternalLogins;
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
-@if (Model.CurrentLogins?.Count > 0)
+<partial for="StatusMessage"
+         name="_StatusMessage" />
+@if(Model.CurrentLogins?.Count > 0)
 {
     <h4>Registered Logins</h4>
     <table class="table">
         <tbody>
-            @foreach (var login in Model.CurrentLogins)
-            {
-                <tr>
-                    <td>@login.LoginProvider</td>
-                    <td>
-                        @if (Model.ShowRemoveButton)
-                        {
-                        <form id="remove-login" asp-page-handler="RemoveLogin" method="post">
+        @foreach(UserLoginInfo login in Model.CurrentLogins)
+        {
+            <tr>
+                <td>@login.ProviderDisplayName</td>
+                <td>
+                    @if(Model.ShowRemoveButton)
+                    {
+                        <form asp-page-handler="RemoveLogin"
+                              id="remove-login"
+                              method="post">
                             <div>
-                                <input asp-for="@login.LoginProvider" name="LoginProvider" type="hidden" />
-                                <input asp-for="@login.ProviderKey" name="ProviderKey" type="hidden" />
-                                <button type="submit" class="btn btn-default" title="Remove this @login.LoginProvider login from your account">Remove</button>
+                                <input asp-for="@login.LoginProvider"
+                                       name="LoginProvider"
+                                       type="hidden" />
+                                <input asp-for="@login.ProviderKey"
+                                       name="ProviderKey"
+                                       type="hidden" />
+                                <button type="submit"
+                                        class="btn btn-primary"
+                                        title="Remove this @login.ProviderDisplayName login from your account">
+                                    Remove
+                                </button>
                             </div>
                         </form>
-                        }
-                        else
-                        {
+                    }
+                    else
+                    {
                         @: &nbsp;
-                        }
-                    </td>
-                </tr>
-            }
+                    }
+                </td>
+            </tr>
+        }
         </tbody>
     </table>
 }
-@if (Model.OtherLogins?.Count > 0)
+@if(Model.OtherLogins?.Count > 0)
 {
     <h4>Add another service to log in.</h4>
     <hr />
-    <form id="link-login-form" asp-page-handler="LinkLogin" method="post" class="form-horizontal">
+    <form asp-page-handler="LinkLogin"
+          class="form-horizontal"
+          id="link-login-form"
+          method="post">
         <div id="socialLoginList">
             <p>
-                @foreach (var provider in Model.OtherLogins)
+                @foreach(AuthenticationScheme provider in Model.OtherLogins)
                 {
-                    <button id="link-login-button" type="submit" class="btn btn-default" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
+                    <button id="link-login-button"
+                            type="submit"
+                            class="btn btn-primary"
+                            name="provider"
+                            value="@provider.Name"
+                            title="Log in using your @provider.DisplayName account">
+                        @provider.DisplayName</button>
                 }
             </p>
         </div>
     </form>
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs
index 9108b26c..5adf82a6 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
index f7b1589e..bf88f874 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
@@ -36,9 +36,11 @@
     ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial for="StatusMessage"
+         name="_StatusMessage" />
 <h4>@ViewData["Title"]</h4>
-<div class="alert alert-warning" role="alert">
+<div class="alert alert-warning"
+     role="alert">
     <p>
         <span class="glyphicon glyphicon-warning-sign"></span>
         <strong>Put these codes in a safe place.</strong>
@@ -52,7 +54,11 @@
     </p>
 </div>
 <div>
-    <form method="post" class="form-group">
-        <button class="btn btn-danger" type="submit">Generate Recovery Codes</button>
+    <form class="form-group"
+          method="post">
+        <button class="btn btn-danger"
+                type="submit">
+            Generate Recovery Codes
+        </button>
     </form>
 </div>
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
index 00ddefaf..80b8995d 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
@@ -63,14 +63,11 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
             if(user == null) return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
 
             bool isTwoFactorEnabled = await _userManager.GetTwoFactorEnabledAsync(user);
-            if(!isTwoFactorEnabled)
-            {
-                string userId = await _userManager.GetUserIdAsync(user);
-                throw new
-                    InvalidOperationException($"Cannot generate recovery codes for user with ID '{userId}' because they do not have 2FA enabled.");
-            }
+            if(isTwoFactorEnabled) return Page();
 
-            return Page();
+            string userId = await _userManager.GetUserIdAsync(user);
+            throw new
+                InvalidOperationException($"Cannot generate recovery codes for user with ID '{userId}' because they do not have 2FA enabled.");
         }
 
         public async Task<IActionResult> OnPostAsync()
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/Index.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/Index.cshtml
index 52644549..49b61744 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/Index.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/Index.cshtml
@@ -33,44 +33,70 @@
 @model IndexModel
 @{
     ViewData["Title"] = "Profile";
+    ViewData["ActivePage"] = ManageNavPages.Index;
 }
 
 <h4>@ViewData["Title"]</h4>
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial for="StatusMessage"
+         name="_StatusMessage" />
 <div class="row">
     <div class="col-md-6">
-        <form id="profile-form" method="post">
-            <div asp-validation-summary="All" class="text-danger"></div>
+        <form id="profile-form"
+              method="post">
+            <div asp-validation-summary="All"
+                 class="text-danger">
+            </div>
             <div class="form-group">
                 <label asp-for="Username"></label>
-                <input asp-for="Username" class="form-control" disabled />
+                <input asp-for="Username"
+                       class="form-control"
+                       disabled />
             </div>
             <div class="form-group">
                 <label asp-for="Input.Email"></label>
-                @if (Model.IsEmailConfirmed)
+                @if(Model.IsEmailConfirmed)
                 {
                     <div class="input-group">
-                        <input asp-for="Input.Email" class="form-control" />
-                        <span class="input-group-addon" aria-hidden="true"><span class="glyphicon glyphicon-ok text-success"></span></span>
+                        <input asp-for="Input.Email"
+                               class="form-control" />
+                        <span aria-hidden="true"
+                              class="input-group-addon">
+                            <span class="glyphicon glyphicon-ok text-success"></span>
+                        </span>
                     </div>
                 }
                 else
                 {
-                    <input asp-for="Input.Email" class="form-control" />
-                    <button id="email-verification" type="submit" asp-page-handler="SendVerificationEmail" class="btn btn-link">Send verification email</button>
+                    <input asp-for="Input.Email"
+                           class="form-control" />
+                    <button asp-page-handler="SendVerificationEmail"
+                            class="btn btn-link"
+                            id="email-verification"
+                            type="submit">
+                        Send verification email
+                    </button>
                 }
-                <span asp-validation-for="Input.Email" class="text-danger"></span>
+                <span asp-validation-for="Input.Email"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
                 <label asp-for="Input.PhoneNumber"></label>
-                <input asp-for="Input.PhoneNumber" class="form-control" />
-                <span asp-validation-for="Input.PhoneNumber" class="text-danger"></span>
+                <input asp-for="Input.PhoneNumber"
+                       class="form-control" />
+                <span asp-validation-for="Input.PhoneNumber"
+                      class="text-danger">
+                </span>
             </div>
-            <button type="submit" class="btn btn-default">Save</button>
+            <button class="btn btn-primary"
+                    id="update-profile-button"
+                    type="submit">
+                Save
+            </button>
         </form>
     </div>
 </div>
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
index 916198bf..8330446e 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
index 0622b446..2150225b 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
@@ -40,10 +40,6 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
 
         public static string ChangePassword => "ChangePassword";
 
-        public static string DownloadPersonalData => "DownloadPersonalData";
-
-        public static string DeletePersonalData => "DeletePersonalData";
-
         public static string ExternalLogins => "ExternalLogins";
 
         public static string PersonalData => "PersonalData";
@@ -55,12 +51,6 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
         public static string ChangePasswordNavClass(ViewContext viewContext) =>
             PageNavClass(viewContext, ChangePassword);
 
-        public static string DownloadPersonalDataNavClass(ViewContext viewContext) =>
-            PageNavClass(viewContext, DownloadPersonalData);
-
-        public static string DeletePersonalDataNavClass(ViewContext viewContext) =>
-            PageNavClass(viewContext, DeletePersonalData);
-
         public static string ExternalLoginsNavClass(ViewContext viewContext) =>
             PageNavClass(viewContext, ExternalLogins);
 
@@ -69,7 +59,7 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
         public static string TwoFactorAuthenticationNavClass(ViewContext viewContext) =>
             PageNavClass(viewContext, TwoFactorAuthentication);
 
-        public static string PageNavClass(ViewContext viewContext, string page)
+        static string PageNavClass(ViewContext viewContext, string page)
         {
             string activePage = viewContext.ViewData["ActivePage"] as string ??
                                 Path.GetFileNameWithoutExtension(viewContext.ActionDescriptor.DisplayName);
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml
index fd66c6b8..31b9d7ce 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml
@@ -44,11 +44,21 @@
         <p>
             <strong>Deleting this data will permanently remove your account, and this cannot be recovered.</strong>
         </p>
-        <form asp-page="DownloadPersonalData" method="post" class="form-group">
-            <button class="btn btn-default" type="submit">Download</button>
+        <form asp-page="DownloadPersonalData"
+              class="form-group"
+              id="download-data"
+              method="post">
+            <button class="btn btn-primary"
+                    type="submit">
+                Download
+            </button>
         </form>
         <p>
-            <a asp-page="DeletePersonalData" class="btn btn-default">Delete</a>
+            <a asp-page="DeletePersonalData"
+               class="btn btn-primary"
+               id="delete">
+                Delete
+            </a>
         </p>
     </div>
 </div>
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs
index 830c0cd4..d2e397bb 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
index 986865f9..bd063715 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
@@ -36,9 +36,11 @@
     ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial for="StatusMessage"
+         name="_StatusMessage" />
 <h4>@ViewData["Title"]</h4>
-<div class="alert alert-warning" role="alert">
+<div class="alert alert-warning"
+     role="alert">
     <p>
         <span class="glyphicon glyphicon-warning-sign"></span>
         <strong>If you reset your authenticator key your authenticator app will not work until you reconfigure it.</strong>
@@ -49,7 +51,13 @@
     </p>
 </div>
 <div>
-    <form id="reset-authenticator-form" method="post" class="form-group">
-        <button id="reset-authenticator-button" class="btn btn-danger" type="submit">Reset authenticator key</button>
+    <form class="form-group"
+          id="reset-authenticator-form"
+          method="post">
+        <button class="btn btn-danger"
+                id="reset-authenticator-button"
+                type="submit">
+            Reset authenticator key
+        </button>
     </form>
 </div>
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
index 2dcc07c0..71a6eb3f 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
@@ -38,9 +38,9 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
 {
     public class ResetAuthenticatorModel : PageModel
     {
-        readonly SignInManager<IdentityUser> _signInManager;
-        ILogger<ResetAuthenticatorModel>     _logger;
-        UserManager<IdentityUser>            _userManager;
+        readonly SignInManager<IdentityUser>      _signInManager;
+        readonly ILogger<ResetAuthenticatorModel> _logger;
+        readonly UserManager<IdentityUser>        _userManager;
 
         public ResetAuthenticatorModel(UserManager<IdentityUser>        userManager,
                                        SignInManager<IdentityUser>      signInManager,
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
index 2f9a8ce0..b32571ee 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
@@ -37,30 +37,43 @@
 }
 
 <h4>Set your password</h4>
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial for="StatusMessage"
+         name="_StatusMessage" />
 <p class="text-info">
     You do not have a local username/password for this site. Add a local
     account so you can log in without an external login.
 </p>
 <div class="row">
     <div class="col-md-6">
-        <form id="set-password-form" method="post">
-            <div asp-validation-summary="All" class="text-danger"></div>
+        <form id="set-password-form"
+              method="post">
+            <div asp-validation-summary="All"
+                 class="text-danger">
+            </div>
             <div class="form-group">
                 <label asp-for="Input.NewPassword"></label>
-                <input asp-for="Input.NewPassword" class="form-control" />
-                <span asp-validation-for="Input.NewPassword" class="text-danger"></span>
+                <input asp-for="Input.NewPassword"
+                       class="form-control" />
+                <span asp-validation-for="Input.NewPassword"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
                 <label asp-for="Input.ConfirmPassword"></label>
-                <input asp-for="Input.ConfirmPassword" class="form-control" />
-                <span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
+                <input asp-for="Input.ConfirmPassword"
+                       class="form-control" />
+                <span asp-validation-for="Input.ConfirmPassword"
+                      class="text-danger">
+                </span>
             </div>
-            <button type="submit" class="btn btn-default">Set password</button>
+            <button class="btn btn-primary"
+                    type="submit">
+                Set password
+            </button>
         </form>
     </div>
 </div>
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs
index c0edbd76..425b049b 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
index 8cd78216..7e9dd574 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
@@ -33,27 +33,29 @@
 @model TwoFactorAuthenticationModel
 @{
     ViewData["Title"] = "Two-factor authentication (2FA)";
+    ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
 }
 
-@Html.Partial("_StatusMessage", Model.StatusMessage)
+<partial for="StatusMessage"
+         name="_StatusMessage" />
 <h4>@ViewData["Title"]</h4>
-@if (Model.Is2faEnabled)
+@if(Model.Is2faEnabled)
 {
-    if (Model.RecoveryCodesLeft == 0)
+    if(Model.RecoveryCodesLeft == 0)
     {
         <div class="alert alert-danger">
             <strong>You have no recovery codes left.</strong>
             <p>You must <a asp-page="./GenerateRecoveryCodes">generate a new set of recovery codes</a> before you can log in with a recovery code.</p>
         </div>
     }
-    else if (Model.RecoveryCodesLeft == 1)
+    else if(Model.RecoveryCodesLeft == 1)
     {
         <div class="alert alert-danger">
             <strong>You have 1 recovery code left.</strong>
             <p>You can <a asp-page="./GenerateRecoveryCodes">generate a new set of recovery codes</a>.</p>
         </div>
     }
-    else if (Model.RecoveryCodesLeft <= 3)
+    else if(Model.RecoveryCodesLeft <= 3)
     {
         <div class="alert alert-warning">
             <strong>You have @Model.RecoveryCodesLeft recovery codes left.</strong>
@@ -61,27 +63,49 @@
         </div>
     }
 
-    if (Model.IsMachineRemembered)
+    if(Model.IsMachineRemembered)
     {
-        <form method="post" style="display: inline-block">
-            <button type="submit" class="btn btn-default">Forget this browser</button>
+        <form method="post"
+              style="display: inline-block">
+            <button class="btn btn-primary"
+                    type="submit">
+                Forget this browser
+            </button>
         </form>
     }
-    <a asp-page="./Disable2fa" class="btn btn-default">Disable 2FA</a>
-    <a asp-page="./GenerateRecoveryCodes" class="btn btn-default">Reset recovery codes</a>
+    <a asp-page="./Disable2fa"
+       class="btn btn-primary">
+        Disable 2FA
+    </a>
+    <a asp-page="./GenerateRecoveryCodes"
+       class="btn btn-primary">
+        Reset recovery codes
+    </a>
 }
 
 <h5>Authenticator app</h5>
-@if (!Model.HasAuthenticator)
+@if(!Model.HasAuthenticator)
 {
-    <a id="enable-authenticator" asp-page="./EnableAuthenticator" class="btn btn-default">Add authenticator app</a>
+    <a asp-page="./EnableAuthenticator"
+       class="btn btn-primary"
+       id="enable-authenticator">
+        Add authenticator app
+    </a>
 }
 else
 {
-    <a id="enable-authenticator" asp-page="./EnableAuthenticator" class="btn btn-default">Setup authenticator app</a>
-    <a id="reset-authenticator" asp-page="./ResetAuthenticator" class="btn btn-default">Reset authenticator app</a>
+    <a asp-page="./EnableAuthenticator"
+       class="btn btn-primary"
+       id="enable-authenticator">
+        Setup authenticator app
+    </a>
+    <a asp-page="./ResetAuthenticator"
+       class="btn btn-primary"
+       id="reset-authenticator">
+        Reset authenticator app
+    </a>
 }
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs
index 7709b60c..d0b46eb1 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
index 9a21270e..af9a05a2 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
@@ -29,11 +29,11 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-@{ 
-    Layout = "/Areas/Identity/Pages/_Layout.cshtml";
+@{
+    Layout = "/Views/Shared/_Layout.cshtml";
 }
 
-<h2>Manage your account</h2>
+<h1>Manage your account</h1>
 
 <div>
     <h4>Change your account settings</h4>
@@ -49,5 +49,5 @@
 </div>
 
 @section Scripts {
-    @RenderSection("Scripts", required: false)
-}
+    @RenderSection("Scripts", false)
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
index b6f6dabc..909c079f 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
 /******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
@@ -31,15 +31,46 @@
 }
 @inject SignInManager<IdentityUser> SignInManager
 @{
-    var hasExternalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).Any();
+    bool hasExternalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).Any();
 }
-<ul class="nav nav-pills nav-stacked">
-    <li class="@ManageNavPages.IndexNavClass(ViewContext)"><a asp-page="./Index">Profile</a></li>
-    <li class="@ManageNavPages.ChangePasswordNavClass(ViewContext)"><a id="change-password" asp-page="./ChangePassword">Password</a></li>
-    @if (hasExternalLogins)
+<ul class="flex-column nav nav-pills">
+    <li class="nav-item">
+        <a class="nav-link @ManageNavPages.IndexNavClass(ViewContext)"
+           id="profile"
+           asp-page="./Index">
+            Profile
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link @ManageNavPages.ChangePasswordNavClass(ViewContext)"
+           id="change-password"
+           asp-page="./ChangePassword">
+            Password
+        </a>
+    </li>
+    @if(hasExternalLogins)
     {
-        <li class="@ManageNavPages.ExternalLoginsNavClass(ViewContext)"><a id="external-login" asp-page="./ExternalLogins">External logins</a></li>
+        <li class="nav-item"
+            id="external-logins">
+            <a id="external-login"
+               class="nav-link @ManageNavPages.ExternalLoginsNavClass(ViewContext)"
+               asp-page="./ExternalLogins">
+                External logins
+            </a>
+        </li>
     }
-    <li class="@ManageNavPages.TwoFactorAuthenticationNavClass(ViewContext)"><a asp-page="./TwoFactorAuthentication">Two-factor authentication</a></li>
-    <li class="@ManageNavPages.PersonalDataNavClass(ViewContext)"><a asp-page="./PersonalData">Personal data</a></li>
-</ul>
+    <li class="nav-item">
+        <a class="nav-link @ManageNavPages.TwoFactorAuthenticationNavClass(ViewContext)"
+           id="two-factor"
+           asp-page="./TwoFactorAuthentication">
+            Two-factor authentication
+        </a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link @ManageNavPages.PersonalDataNavClass(ViewContext)"
+           id="personal-data"
+           asp-page="./PersonalData">
+            Personal data
+        </a>
+    </li>
+</ul>
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml
index 44e7836d..5ec28d16 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml
@@ -31,11 +31,17 @@
 }
 @model string
 
-@if (!String.IsNullOrEmpty(Model))
+@if(!string.IsNullOrEmpty(Model))
 {
-    var statusMessageClass = Model.StartsWith("Error") ? "danger" : "success";
-    <div class="alert alert-@statusMessageClass alert-dismissible" role="alert">
-        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    string statusMessageClass = Model.StartsWith("Error") ? "danger" : "success";
+    <div class="alert alert-@statusMessageClass alert-dismissible"
+         role="alert">
+        <button aria-label="Close"
+                class="close"
+                data-dismiss="alert"
+                type="button">
+            <span aria-hidden="true">&times;</span>
+        </button>
         @Model
     </div>
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml b/cicm_web/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
index 9cc7404d..ff12cbd7 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
 /******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
diff --git a/cicm_web/Areas/Identity/Pages/Account/Register.cshtml b/cicm_web/Areas/Identity/Pages/Account/Register.cshtml
index 53030240..b1168756 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Register.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/Register.cshtml
@@ -35,34 +35,49 @@
     ViewData["Title"] = "Register";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 
 <div class="row">
     <div class="col-md-4">
-        <form asp-route-returnUrl="@Model.ReturnUrl" method="post">
+        <form asp-route-returnUrl="@Model.ReturnUrl"
+              method="post">
             <h4>Create a new account.</h4>
             <hr />
-            <div asp-validation-summary="All" class="text-danger"></div>
+            <div asp-validation-summary="All"
+                 class="text-danger">
+            </div>
             <div class="form-group">
                 <label asp-for="Input.Email"></label>
-                <input asp-for="Input.Email" class="form-control" />
-                <span asp-validation-for="Input.Email" class="text-danger"></span>
+                <input asp-for="Input.Email"
+                       class="form-control" />
+                <span asp-validation-for="Input.Email"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
                 <label asp-for="Input.Password"></label>
-                <input asp-for="Input.Password" class="form-control" />
-                <span asp-validation-for="Input.Password" class="text-danger"></span>
+                <input asp-for="Input.Password"
+                       class="form-control" />
+                <span asp-validation-for="Input.Password"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
                 <label asp-for="Input.ConfirmPassword"></label>
-                <input asp-for="Input.ConfirmPassword" class="form-control" />
-                <span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
+                <input asp-for="Input.ConfirmPassword"
+                       class="form-control" />
+                <span asp-validation-for="Input.ConfirmPassword"
+                      class="text-danger">
+                </span>
             </div>
-            <button type="submit" class="btn btn-default">Register</button>
+            <button class="btn btn-primary"
+                    type="submit">
+                Register
+            </button>
         </form>
     </div>
 </div>
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/Register.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/Register.cshtml.cs
index 7236fecc..8f8813ab 100644
--- a/cicm_web/Areas/Identity/Pages/Account/Register.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/Register.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/ResetPassword.cshtml b/cicm_web/Areas/Identity/Pages/Account/ResetPassword.cshtml
index e3df8c1a..cbf565dd 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ResetPassword.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/ResetPassword.cshtml
@@ -35,34 +35,49 @@
     ViewData["Title"] = "Reset password";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <h4>Reset your password.</h4>
 <hr />
 <div class="row">
     <div class="col-md-4">
         <form method="post">
-            <div asp-validation-summary="All" class="text-danger"></div>
-            <input asp-for="Input.Code" type="hidden" />
+            <div asp-validation-summary="All"
+                 class="text-danger">
+            </div>
+            <input asp-for="Input.Code"
+                   type="hidden" />
             <div class="form-group">
                 <label asp-for="Input.Email"></label>
-                <input asp-for="Input.Email" class="form-control" />
-                <span asp-validation-for="Input.Email" class="text-danger"></span>
+                <input asp-for="Input.Email"
+                       class="form-control" />
+                <span asp-validation-for="Input.Email"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
                 <label asp-for="Input.Password"></label>
-                <input asp-for="Input.Password" class="form-control" />
-                <span asp-validation-for="Input.Password" class="text-danger"></span>
+                <input asp-for="Input.Password"
+                       class="form-control" />
+                <span asp-validation-for="Input.Password"
+                      class="text-danger">
+                </span>
             </div>
             <div class="form-group">
                 <label asp-for="Input.ConfirmPassword"></label>
-                <input asp-for="Input.ConfirmPassword" class="form-control" />
-                <span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
+                <input asp-for="Input.ConfirmPassword"
+                       class="form-control" />
+                <span asp-validation-for="Input.ConfirmPassword"
+                      class="text-danger">
+                </span>
             </div>
-            <button type="submit" class="btn btn-default">Reset</button>
+            <button class="btn btn-primary"
+                    type="submit">
+                Reset
+            </button>
         </form>
     </div>
 </div>
 
 @section Scripts {
     <partial name="_ValidationScriptsPartial" />
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs
index 377cf51f..2357d7b8 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs
@@ -1,8 +1,8 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
-// Filename       : ResetPassword.cshtml.cs
+// Filename       : ResetPasswordConfirmation.cshtml.cs
 // Author(s)      : Natalia Portillo <claunia@claunia.com>
 //
 // --[ Description ] ----------------------------------------------------------
@@ -63,7 +63,9 @@ namespace cicm_web.Areas.Identity.Pages.Account
             if(!ModelState.IsValid) return Page();
 
             IdentityUser user = await _userManager.FindByEmailAsync(Input.Email);
-            if(user == null) return RedirectToPage("./ResetPasswordConfirmation");
+            if(user == null)
+                // Don't reveal that the user does not exist
+                return RedirectToPage("./ResetPasswordConfirmation");
 
             IdentityResult result = await _userManager.ResetPasswordAsync(user, Input.Code, Input.Password);
             if(result.Succeeded) return RedirectToPage("./ResetPasswordConfirmation");
diff --git a/cicm_web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml b/cicm_web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml
index 07fe51bd..a610574d 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml
@@ -35,7 +35,7 @@
     ViewData["Title"] = "Reset password confirmation";
 }
 
-<h2>@ViewData["Title"]</h2>
+<h1>@ViewData["Title"]</h1>
 <p>
     Your password has been reset. Please <a asp-page="./Login">click here to log in</a>.
-</p>
+</p>
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs b/cicm_web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
index 3c1dd9f1..247f3768 100644
--- a/cicm_web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
diff --git a/cicm_web/Areas/Identity/Pages/Account/_ViewImports.cshtml b/cicm_web/Areas/Identity/Pages/Account/_ViewImports.cshtml
index b8d98056..e7e0d0b8 100644
--- a/cicm_web/Areas/Identity/Pages/Account/_ViewImports.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Account/_ViewImports.cshtml
@@ -1,32 +1 @@
-@{
-/******************************************************************************
-// Canary Islands Computer Museum Website
-// ----------------------------------------------------------------------------
-//
-// Filename       : _ViewImports.cshtml
-// Author(s)      : Natalia Portillo <claunia@claunia.com>
-//
-// --[ Description ] ----------------------------------------------------------
-//
-//     ASP.NET Identify management
-//
-// --[ 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-2018 Natalia Portillo
-*******************************************************************************/
-}
 @using cicm_web.Areas.Identity.Pages.Account
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Error.cshtml b/cicm_web/Areas/Identity/Pages/Error.cshtml
index b6a424c3..0e224a2f 100644
--- a/cicm_web/Areas/Identity/Pages/Error.cshtml
+++ b/cicm_web/Areas/Identity/Pages/Error.cshtml
@@ -38,7 +38,7 @@
 <h1 class="text-danger">Error.</h1>
 <h2 class="text-danger">An error occurred while processing your request.</h2>
 
-@if (Model.ShowRequestId)
+@if(Model.ShowRequestId)
 {
     <p>
         <strong>Request ID:</strong> <code>@Model.RequestId</code>
@@ -51,4 +51,4 @@
 </p>
 <p>
     <strong>Development environment should not be enabled in deployed applications</strong>, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>, and restarting the application.
-</p>
+</p>
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/Error.cshtml.cs b/cicm_web/Areas/Identity/Pages/Error.cshtml.cs
index 90d01e71..e5b6236e 100644
--- a/cicm_web/Areas/Identity/Pages/Error.cshtml.cs
+++ b/cicm_web/Areas/Identity/Pages/Error.cshtml.cs
@@ -1,4 +1,4 @@
-/******************************************************************************
+/******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
 //
@@ -36,13 +36,13 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
 namespace cicm_web.Areas.Identity.Pages
 {
     [AllowAnonymous]
+    [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     public class ErrorModel : PageModel
     {
         public string RequestId { get; set; }
 
         public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
 
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
         public void OnGet()
         {
             RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
diff --git a/cicm_web/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml b/cicm_web/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
index 834f3e3d..4b6291c7 100644
--- a/cicm_web/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
+++ b/cicm_web/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
 /******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
@@ -30,20 +30,20 @@
 *******************************************************************************/
 }
 <environment include="Development">
-    <script src="~/Identity/lib/jquery-validation/dist/jquery.validate.js"></script>
-    <script src="~/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
+    <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
+    <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
 <environment exclude="Development">
-    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.17.0/jquery.validate.min.js"
-            asp-fallback-src="~/Identity/lib/jquery-validation/dist/jquery.validate.min.js"
+    <script asp-fallback-src="~/Identity/lib/jquery-validation/dist/jquery.validate.min.js"
             asp-fallback-test="window.jQuery && window.jQuery.validator"
             crossorigin="anonymous"
-            integrity="sha384-rZfj/ogBloos6wzLGpPkkOr/gpkBNLZ6b6yLy4o+ok+t/SAKlL5mvXLr0OXNi1Hp">
+            integrity="sha384-rZfj/ogBloos6wzLGpPkkOr/gpkBNLZ6b6yLy4o+ok+t/SAKlL5mvXLr0OXNi1Hp"
+            src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.17.0/jquery.validate.min.js">
     </script>
-    <script src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.9/jquery.validate.unobtrusive.min.js"
-            asp-fallback-src="~/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
+    <script asp-fallback-src="~/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
             asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
             crossorigin="anonymous"
-            integrity="sha384-ifv0TYDWxBHzvAk2Z0n8R434FL1Rlv/Av18DXE43N/1rvHyOG4izKst0f2iSLdds">
+            integrity="sha384-ifv0TYDWxBHzvAk2Z0n8R434FL1Rlv/Av18DXE43N/1rvHyOG4izKst0f2iSLdds"
+            src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.9/jquery.validate.unobtrusive.min.js">
     </script>
-</environment>
+</environment>
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/_ViewImports.cshtml b/cicm_web/Areas/Identity/Pages/_ViewImports.cshtml
index b17bf810..21f50226 100644
--- a/cicm_web/Areas/Identity/Pages/_ViewImports.cshtml
+++ b/cicm_web/Areas/Identity/Pages/_ViewImports.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
 /******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
@@ -33,4 +33,4 @@
 @using cicm_web.Areas.Identity
 @using Microsoft.AspNetCore.Identity
 @namespace cicm_web.Areas.Identity.Pages
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/cicm_web/Areas/Identity/Pages/_ViewStart.cshtml b/cicm_web/Areas/Identity/Pages/_ViewStart.cshtml
index 79b7544d..4a8cf017 100644
--- a/cicm_web/Areas/Identity/Pages/_ViewStart.cshtml
+++ b/cicm_web/Areas/Identity/Pages/_ViewStart.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
 /******************************************************************************
 // Canary Islands Computer Museum Website
 // ----------------------------------------------------------------------------
@@ -29,7 +29,6 @@
 // Copyright © 2003-2018 Natalia Portillo
 *******************************************************************************/
 }
-
 @{
     Layout = "/Views/Shared/_Layout.cshtml";
-}
+}
\ No newline at end of file
diff --git a/cicm_web/Startup.cs b/cicm_web/Startup.cs
index f378b388..56cf6fdc 100644
--- a/cicm_web/Startup.cs
+++ b/cicm_web/Startup.cs
@@ -62,8 +62,6 @@ namespace cicm_web
             services.AddDbContext<cicmContext>(options => options
                                                          .UseLazyLoadingProxies()
                                                          .UseMySql("server=localhost;port=3306;user=cicm;password=cicmpass;database=cicm"));
-            services.AddDefaultIdentity<IdentityUser>()
-                .AddEntityFrameworkStores<cicmContext>();
             services.AddMvc();
         }
 
diff --git a/cicm_web/appsettings.json b/cicm_web/appsettings.json
index 5fff67ba..f484e8a8 100644
--- a/cicm_web/appsettings.json
+++ b/cicm_web/appsettings.json
@@ -1,8 +1,8 @@
-{
+{
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
       "Default": "Warning"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/cicm_web/cicm_web.csproj b/cicm_web/cicm_web.csproj
index 2a2d0963..5da898a9 100644
--- a/cicm_web/cicm_web.csproj
+++ b/cicm_web/cicm_web.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
-    <Version>3.0.99.358</Version>
+    <Version>3.0.99.371</Version>
     <Company>Canary Islands Computer Museum</Company>
     <Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
     <Product>Canary Islands Computer Museum Website</Product>