diff --git a/GWMS.UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml b/GWMS.UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
index d84e93b..e17c01d 100644
--- a/GWMS.UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
+++ b/GWMS.UI/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
@@ -1,7 +1,21 @@
 @page
 @model ConfirmEmailModel
 @{
-    ViewData["Title"] = "Confirm email";
+    ViewData["Title"] = "Conferma Effettuata";
 }
 
-<h1>@ViewData["Title"]</h1>
\ No newline at end of file
+<div class="card">
+    <div class="card-header"><h1>@ViewData["Title"]</h1></div>
+    <div class="card-body">
+        <div class="alert alert-success">
+            <p>L'email è stata confermata! ora puoi effettuare il login all'applicazione</p>
+        </div>
+        <div class="card-footer">
+            <div class="row">
+                <div class="col-6">
+                    <a title="LogIn" href="Identity/Account/LogIn" class="btn btn-sm btn-success btn-block"><i class="fas fa-sign-in-alt"></i> Login Page</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/GWMS.UI/Areas/Identity/Pages/Account/LogOut.cshtml b/GWMS.UI/Areas/Identity/Pages/Account/LogOut.cshtml
index d240159..f50f240 100644
--- a/GWMS.UI/Areas/Identity/Pages/Account/LogOut.cshtml
+++ b/GWMS.UI/Areas/Identity/Pages/Account/LogOut.cshtml
@@ -4,18 +4,37 @@
     ViewData["Title"] = "Log out";
 }
 
-<header>
-    <h1>@ViewData["Title"]</h1>
-    @{
-        if (User.Identity.IsAuthenticated)
-        {
-            <form class="form-inline" asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Page("/", new { area = "" })" method="post">
-                <button type="submit" class="nav-link btn btn-warning">Click here to Logout</button>
-            </form>
+<div class="card">
+    <div class="card-header"><h1>@ViewData["Title"]</h1></div>
+    <div class="card-body">
+        @{
+            if (User.Identity.IsAuthenticated)
+            {
+                <form class="form-inline" asp-area="Identity" asp-page="/Account/Logout" asp-route-returnUrl="@Url.Page("/", new { area = "" })" method="post">
+                    <div class="row">
+                        <div class="col-12">
+                            <p>Premendo sul pulsante effettuerai il logout dal sistema.</p>
+                        </div>
+                        <div class="col-6">
+                            <button type="submit" class="nav-link btn btn-warning"><i class="fas fa-sign-out-alt"></i> Clicca per Logout</button>
+                        </div>
+                    </div>
+                </form>
+            }
+            else
+            {
+                <div class="row">
+                    <div class="col-12">
+                        <p>Disconnesisone effettuata.</p>
+                    </div>
+                    <div class="col-6">
+                        <a title="Home" href="~/" class="btn btn-sm btn-primary btn-block"><i class="fas fa-home"></i> Home Page</a>
+                    </div>
+                    <div class="col-6">
+                        <a title="LogIn" href="Identity/Account/LogIn" class="btn btn-sm btn-success btn-block"><i class="fas fa-sign-in-alt"></i> Login Page</a>
+                    </div>
+                </div>
+            }
         }
-        else
-        {
-            <p>You have successfully logged out of the application.</p>
-        }
-    }
-</header>
\ No newline at end of file
+    </div>
+</div>
\ No newline at end of file
diff --git a/GWMS.UI/Areas/Identity/Pages/Account/Login.cshtml b/GWMS.UI/Areas/Identity/Pages/Account/Login.cshtml
index 85eb463..44cfac6 100644
--- a/GWMS.UI/Areas/Identity/Pages/Account/Login.cshtml
+++ b/GWMS.UI/Areas/Identity/Pages/Account/Login.cshtml
@@ -10,7 +10,7 @@
     <div class="col-md-6">
         <section>
             <form id="account" method="post">
-                <h4>Use a local account to log in.</h4>
+                <h4>Effettuare login con l'account registrato.</h4>
                 <hr />
                 <div asp-validation-summary="All" class="text-danger"></div>
                 <div class="form-group">
@@ -31,19 +31,22 @@
                         </label>
                     </div>
                 </div>
-                <div class="form-group">
-                    <button type="submit" class="btn btn-primary">Log in</button>
+
+                <div class="form-row">
+                    <div class="col">
+                        <button type="submit" class="btn btn-block btn-primary"><i class="fas fa-sign-in-alt"></i> Log in</button>
+                    </div>
+                    <div class="col">
+                        <a asp-page="./Register" class="btn btn-block btn-outline-primary" asp-route-returnUrl="@Model.ReturnUrl"><i class="fas fa-edit"></i> Registra account</a>
+                    </div>
                 </div>
-                <div class="form-group">
-                    <p>
-                        <a id="forgot-password" asp-page="./ForgotPassword">Forgot your password?</a>
-                    </p>
-                    <p>
-                        <a asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Register as a new user</a>
-                    </p>
-                    <p>
-                        <a id="resend-confirmation" asp-page="./ResendEmailConfirmation">Resend email confirmation</a>
-                    </p>
+                <div class="form-row mt-2">
+                    <div class="col">
+                        <a id="forgot-password" class="btn btn-block btn-outline-info" asp-page="./ForgotPassword"><i class="far fa-life-ring"></i> Password dimenticata?</a>
+                    </div>
+                    <div class="col">
+                        <a id="resend-confirmation" class="btn btn-block btn-outline-dark" asp-page="./ResendEmailConfirmation"><i class="far fa-envelope"></i> (Re)Invia email conferma</a>
+                    </div>
                 </div>
             </form>
         </section>
diff --git a/GWMS.UI/Areas/Identity/Pages/Account/Register.cshtml b/GWMS.UI/Areas/Identity/Pages/Account/Register.cshtml
index 878acc0..9728e05 100644
--- a/GWMS.UI/Areas/Identity/Pages/Account/Register.cshtml
+++ b/GWMS.UI/Areas/Identity/Pages/Account/Register.cshtml
@@ -27,7 +27,7 @@
                 <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-primary">Registra</button>
+            <button type="submit" class="btn btn-success btn-block"><i class="far fa-save"></i> Registra Account</button>
         </form>
     </div>
     @*<div class="col-md-6 col-md-offset-2">
diff --git a/GWMS.UI/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml b/GWMS.UI/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml
index b851192..6635e8f 100644
--- a/GWMS.UI/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml
+++ b/GWMS.UI/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml
@@ -1,22 +1,24 @@
 @page
 @model RegisterConfirmationModel
 @{
-    ViewData["Title"] = "Register confirmation";
+    ViewData["Title"] = "Conferma richiesta";
 }
 
-<h1>@ViewData["Title"]</h1>
-@{
-    if (@Model.DisplayConfirmAccountLink)
-    {
-<p>
-    This app does not currently have a real email sender registered, see <a href="https://aka.ms/aspaccountconf">these docs</a> for how to configure a real email sender.
-    Normally this would be emailed: <a id="confirm-link" href="@Model.EmailConfirmationUrl">Click here to confirm your account</a>
-</p>
-    }
-    else
-    {
-<p>
-        Please check your email to confirm your account.
-</p>
-    }
-}
+<div class="card">
+    <div class="card-header"><h1>@ViewData["Title"]</h1></div>
+    <div class="card-body">
+        <div class="alert alert-warning">
+            <h4>Account creato!</h4>
+            <p>Ora è necessario effettuare la verifica dell'email registrata</p>
+        </div>
+        <b>Prego verifica la posta ricevuta all'account registrato per effettuare la conferma.</b>
+        <p>Riceverai un email da steamwarebot at gmail.com con un link da cliccare per completare la registrazione. Dopo la conferma potrai effettuare il login all'applicazione.</p>
+    </div>
+    <div class="card-footer">
+        <div class="row">
+            <div class="col-6">
+                <a title="LogIn" href="Identity/Account/LogIn" class="btn btn-sm btn-success btn-block"><i class="fas fa-sign-in-alt"></i> Login Page</a>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/GWMS.UI/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs b/GWMS.UI/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs
index 74abbcc..4b0089e 100644
--- a/GWMS.UI/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs
+++ b/GWMS.UI/Areas/Identity/Pages/Account/RegisterConfirmation.cshtml.cs
@@ -31,7 +31,6 @@ namespace GWMS.UI.Areas.Identity.Pages.Account
 
         #region Public Properties
 
-        public bool DisplayConfirmAccountLink { get; set; }
         public string Email { get; set; }
         public string EmailConfirmationUrl { get; set; }
 
@@ -53,19 +52,6 @@ namespace GWMS.UI.Areas.Identity.Pages.Account
             }
 
             Email = email;
-            // Once you add a real email sender, you should remove this code that lets you confirm the account
-            DisplayConfirmAccountLink = false;
-            if (DisplayConfirmAccountLink)
-            {
-                var userId = await _userManager.GetUserIdAsync(user);
-                var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
-                code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
-                EmailConfirmationUrl = Url.Page(
-                    "/Account/ConfirmEmail",
-                    pageHandler: null,
-                    values: new { area = "Identity", userId = userId, code = code, returnUrl = returnUrl },
-                    protocol: Request.Scheme);
-            }
 
             return Page();
         }
diff --git a/GWMS.UI/GWMS.UI.csproj b/GWMS.UI/GWMS.UI.csproj
index 8c4a1d9..75dac84 100644
--- a/GWMS.UI/GWMS.UI.csproj
+++ b/GWMS.UI/GWMS.UI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>1.0.2108.2517</Version>
+    <Version>1.0.2108.2518</Version>
     <UserSecretsId>95c9f021-52d1-4390-a670-5810b7b777b0</UserSecretsId>
   </PropertyGroup>
 
diff --git a/GWMS.UI/Pages/Shared/_Layout.cshtml b/GWMS.UI/Pages/Shared/_Layout.cshtml
index 2257d92..e5fd2af 100644
--- a/GWMS.UI/Pages/Shared/_Layout.cshtml
+++ b/GWMS.UI/Pages/Shared/_Layout.cshtml
@@ -17,6 +17,7 @@
     <title>GWMS User Management</title>
     <base href="~/" />
     <link rel="stylesheet" href="~/Identity/lib/bootstrap/dist/css/bootstrap.min.css" />
+    <link rel="stylesheet" href="font-awesome/css/fontawesome.css" />
     <link rel="stylesheet" href="~/Identity/css/site.css" />
     <link rel="stylesheet" href="~/css/site.css" />
 </head>
@@ -62,6 +63,7 @@
     <script src="~/Identity/lib/jquery/dist/jquery.min.js"></script>
     <script src="~/Identity/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
     <script src="~/Identity/js/site.js" asp-append-version="true"></script>
+    <script src="font-awesome/js/all.js"></script>
     @RenderSection("Scripts", required: false)
 </body>
 </html>
\ No newline at end of file
diff --git a/GWMS.UI/Pages/Suppliers.razor.cs b/GWMS.UI/Pages/Suppliers.razor.cs
index 262bf46..327b1a9 100644
--- a/GWMS.UI/Pages/Suppliers.razor.cs
+++ b/GWMS.UI/Pages/Suppliers.razor.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace GWMS.UI.Pages
 {
-    [Authorize(Roles = "SuperAdmin, Admin, User")]
+    [Authorize(Roles = "SuperAdmin, Admin, ExtUser")]
     public partial class Suppliers : ComponentBase, IDisposable
     {
         #region Private Fields
diff --git a/GWMS.UI/Pages/Transporters.razor.cs b/GWMS.UI/Pages/Transporters.razor.cs
index 98c530b..64b7169 100644
--- a/GWMS.UI/Pages/Transporters.razor.cs
+++ b/GWMS.UI/Pages/Transporters.razor.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace GWMS.UI.Pages
 {
-    [Authorize(Roles = "SuperAdmin, Admin, UserExt")]
+    [Authorize(Roles = "SuperAdmin, Admin, ExtUser")]
     public partial class Transporters : ComponentBase, IDisposable
     {
         #region Private Fields
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index e6bb9a4..482bf70 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>GWMS - Gas Warehouse Management System</i>
-    <h4>Versione: 1.0.2108.2517</h4>
+    <h4>Versione: 1.0.2108.2518</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index cee3401..80b22ca 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2108.2517
+1.0.2108.2518
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 0ce367e..cf7f093 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2108.2517</version>
+  <version>1.0.2108.2518</version>
   <url>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>