diff --git a/CSharp/AuthorizationServer/Views/Account/Login.cshtml b/CSharp/AuthorizationServer/Views/Account/Login.cshtml
index e1bfe33..dad55e1 100644
--- a/CSharp/AuthorizationServer/Views/Account/Login.cshtml
+++ b/CSharp/AuthorizationServer/Views/Account/Login.cshtml
@@ -43,14 +43,16 @@
                 {
                     <div class="col-lg-6 col-md-8">
 
-                        <img src="~/images/logo-login.svg" alt="logo" style="height: 66px;" class="mb-5">
+                        <a href="~/">
+                            <img src="~/images/logo-login.svg" alt="logo" style="height: 66px;" class="mb-5">
+                        </a>
 
-                        <ul class="nav nav-tabs">
-                            <li class="nav-item" onclick="usePassword()">
+                        <ul class="nav nav-tabs d-flex justify-content-between w-100">
+                            <li class="nav-item" onclick="usePassword()" style="width: 50%; text-align: center;">
                                 <a class="nav-link active" href="#" id="passwordTab"><i class="fas fa-key mr-2"></i>Use
                                     Password</a>
                             </li>
-                            <li class="nav-item" onclick="useTotp()">
+                            <li class="nav-item" onclick="useTotp()" style="width: 50%; text-align: center;">
                                 <a class="nav-link" href="#" id="totpTab"><i class="fas fa-mobile-alt mr-2"></i>Use Mobile
                                     Phone</a>
                             </li>
@@ -77,8 +79,7 @@
 
                                     <div class="form-group" style="display: none;" id="totp-input">
                                         <label asp-for="Totp">TOTP</label>
-                                        <input type="password" class="form-control rounded-sm"
-                                            placeholder="Type in the one-time-password from your authenticator app"
+                                        <input type="password" class="form-control rounded-sm" placeholder="Code"
                                             asp-for="Totp" autocomplete="off">
                                     </div>
 
diff --git a/CSharp/AuthorizationServer/Views/Shared/_Nav.cshtml b/CSharp/AuthorizationServer/Views/Shared/_Nav.cshtml
index a1a11a2..7c2ac0a 100644
--- a/CSharp/AuthorizationServer/Views/Shared/_Nav.cshtml
+++ b/CSharp/AuthorizationServer/Views/Shared/_Nav.cshtml
@@ -20,7 +20,8 @@
             {
                 <ul class="navbar-nav">
                     <li class="nav-item dropdown">
-                        <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">@name <b class="caret"></b></a>
+                        <a href="#" class="nav-link dropdown-toggle px-3 py-2 rounded bg-white text-secondary"
+                            data-toggle="dropdown">@name <b class="caret"></b></a>
 
                         <div class="dropdown-menu">
                             <a class="dropdown-item" asp-action="RegisterMobileDevice"
diff --git a/CSharp/TaxApp/Pages/Index.cshtml b/CSharp/TaxApp/Pages/Index.cshtml
index 6d1ae6f..1f52bdc 100644
--- a/CSharp/TaxApp/Pages/Index.cshtml
+++ b/CSharp/TaxApp/Pages/Index.cshtml
@@ -20,7 +20,7 @@
     <div class="container mt-5">
         <h4 class="mt-5 mb-3 font-weight-bold">Taxable Properties</h4>
         <table class="table mt-3 rounded table-bordered">
-            <thead class="table-primary">
+            <thead class="bg-secondary text-white">
                 <tr>
                     <th scope="col">Area</th>
                     <th scope="col">Adress</th>
@@ -42,7 +42,7 @@
     <div class="container">
         <h4 class="mt-5 mb-3 font-weight-bold">Vehicles</h4>
         <table class="table mt-3 rounded table-bordered">
-            <thead class="table-primary">
+            <thead class="bg-secondary text-white">
                 <tr>
                     <th scope="col">Model</th>
                     <th scope="col">License Plate</th>