diff --git a/Template.Maui/wwwroot/index.html b/Template.Maui/wwwroot/index.html
index dbdc694..9c832fe 100644
--- a/Template.Maui/wwwroot/index.html
+++ b/Template.Maui/wwwroot/index.html
@@ -51,6 +51,7 @@
 <script src="_content/CodeBeam.MudBlazor.Extensions/MudExtensions.min.js"></script>
 <script src="_content/Template.Shared/js/main.js"></script>
 <script src="_content/Template.Shared/js/calendar.js"></script>
+<script src="_content/Template.Shared/js/header.js"></script>
 
 </body>
 
diff --git a/Template.Shared/Components/Layout/HeaderLayout.razor b/Template.Shared/Components/Layout/HeaderLayout.razor
index b447692..afde371 100644
--- a/Template.Shared/Components/Layout/HeaderLayout.razor
+++ b/Template.Shared/Components/Layout/HeaderLayout.razor
@@ -1,6 +1,6 @@
 @inject IJSRuntime JS
 
-<div class="container header">
+<div class="@(Back ? "" : "container") header">
     <div class="header-content @(Back ? "with-back" : "no-back")">
         @if (Back)
         {
@@ -22,11 +22,17 @@
             {
                 @if (ShowFilter)
                 {
-                    <MudIconButton OnClick="OnFilterToggle" Icon="@Icons.Material.Outlined.FilterAlt" Color="Color.Dark" />
+                    <MudIconButton OnClick="OnFilterToggle" Icon="@Icons.Material.Outlined.FilterAlt" Color="Color.Dark"/>
                 }
-                @if (ShowCalendarToggle)
+
+                @* @if (ShowCalendarToggle)
                 {
                     <MudIconButton OnClick="OnCalendarToggle" Icon="@Icons.Material.Filled.CalendarMonth" Color="Color.Dark"/>
+                } *@
+
+                @if (ShowProfile)
+                {
+                    <MudIconButton Class="user" OnClick="OpenPersonalInfo" Icon="@Icons.Material.Filled.Person" Color="Color.Dark"/>
                 }
             }
             else
@@ -45,8 +51,9 @@
 @code{
     [Parameter] public string? Title { get; set; }
     [Parameter] public bool ShowFilter { get; set; }
-    [Parameter] public bool ShowNotifications { get; set; } = true;
+    [Parameter] public bool ShowProfile { get; set; } = true;
     [Parameter] public bool Back { get; set; }
+    [Parameter] public bool BackOnTop { get; set; }
     [Parameter] public string BackTo { get; set; } = "";
 
     [Parameter] public EventCallback OnFilterToggle { get; set; }
@@ -74,7 +81,9 @@
         }
 
         await JS.InvokeVoidAsync("goBack");
-
     }
 
+    private void OpenPersonalInfo() =>
+        NavigationManager.NavigateTo("/PersonalInfo");
+
 }
\ No newline at end of file
diff --git a/Template.Shared/Components/Layout/HeaderLayout.razor.css b/Template.Shared/Components/Layout/HeaderLayout.razor.css
index 77750ce..5d06b34 100644
--- a/Template.Shared/Components/Layout/HeaderLayout.razor.css
+++ b/Template.Shared/Components/Layout/HeaderLayout.razor.css
@@ -6,8 +6,6 @@
     position: relative;
 }
 
-.header-content.with-back { margin: .6rem 0 0 0; }
-
 .header-content.with-back .page-title {
     position: absolute;
     left: 50%;
@@ -16,14 +14,10 @@
     font-size: larger;
 }
 
-.left-section ::deep button, .right-section ::deep button {
-    font-size: 1.1rem;
-}
+.right-section { min-height: 45px; }
 
-.left-section ::deep .mud-button-icon-start {
-    margin-right: 3px !important;
-}
+.left-section ::deep button, .right-section ::deep button { font-size: 1.1rem; }
 
-.header-content.no-back .page-title {
-    margin: 0;
-}
\ No newline at end of file
+.left-section ::deep .mud-button-icon-start { margin-right: 3px !important; }
+
+.header-content.no-back .page-title { margin: 0; }
\ No newline at end of file
diff --git a/Template.Shared/Components/Layout/NavMenu.razor b/Template.Shared/Components/Layout/NavMenu.razor
index 0756627..f06e737 100644
--- a/Template.Shared/Components/Layout/NavMenu.razor
+++ b/Template.Shared/Components/Layout/NavMenu.razor
@@ -1,16 +1,14 @@
 @inject IDialogService Dialog
 
-@if (IsVisible)
-{
-    <nav class="navbar navbar-expand justify-content-center">
+<div class="container animated-navbar @(IsVisible ? "show-nav" : "hide-nav") @(IsVisible? PlusVisible ? "with-plus" : "without-plus" : "with-plus")">
+    <nav class="navbar @(IsVisible? PlusVisible ? "with-plus" : "without-plus" : "with-plus")">
         <div class="container-navbar">
-            <ul class="navbar-nav nav-justified align-items-center w-100 text-center">
-
+            <ul class="navbar-nav flex-row nav-justified align-items-center w-100 text-center">
                 <li class="nav-item">
                     <NavLink class="nav-link" href="Users" Match="NavLinkMatch.All">
                         <div class="d-flex flex-column">
                             <i class="ri-group-line"></i>
-                            @* <span>Contatti</span> *@
+                            <span>Contatti</span>
                         </div>
                     </NavLink>
                 </li>
@@ -18,47 +16,40 @@
                     <NavLink class="nav-link" href="Calendar" Match="NavLinkMatch.All">
                         <div class="d-flex flex-column">
                             <i class="ri-calendar-todo-line"></i>
-                            @* <span>Agenda</span> *@
+                            <span>Agenda</span>
                         </div>
                     </NavLink>
                 </li>
-
-
-                <li class="nav-item plus-button">
-                    <MudMenu PopoverClass="custom_popover" AnchorOrigin="Origin.TopCenter" TransformOrigin="Origin.BottomCenter">
-                        <ActivatorContent>
-                            <MudFab Class="custom-plus-button" Color="Color.Primary" Size="Size.Medium" IconSize="Size.Medium" StartIcon="@Icons.Material.Filled.Add"/>
-                        </ActivatorContent>
-                        <ChildContent>
-                            <MudMenuItem Disabled="true">Nuovo contatto</MudMenuItem>
-                            <MudMenuItem OnClick="() => ModalHelpers.OpenActivityForm(Dialog)">Nuova attività</MudMenuItem>
-                        </ChildContent>
-                    </MudMenu>
-                </li>
-
                 <li class="nav-item">
                     <NavLink class="nav-link" href="Notifications" Match="NavLinkMatch.All">
                         <div class="d-flex flex-column">
                             <i class="ri-notification-4-line"></i>
-                        </div>
-                    </NavLink>
-                </li>
-                <li class="nav-item">
-                    <NavLink class="nav-link" href="PersonalInfo" Match="NavLinkMatch.All">
-                        <div class="d-flex flex-column">
-                            <i class="ri-user-line"></i>
-                            @* <span>Profilo</span> *@
+                            <span>Notifiche</span>
                         </div>
                     </NavLink>
                 </li>
             </ul>
         </div>
+
+        @if (PlusVisible)
+        {
+            <MudMenu PopoverClass="custom_popover" AnchorOrigin="Origin.TopLeft" TransformOrigin="Origin.BottomRight">
+                <ActivatorContent>
+                    <MudFab Class="custom-plus-button" Color="Color.Surface" Size="Size.Medium" IconSize="Size.Medium" IconColor="Color.Primary" StartIcon="@Icons.Material.Filled.Add" />
+                </ActivatorContent>
+                <ChildContent>
+                    <MudMenuItem Disabled="true">Nuovo contatto</MudMenuItem>
+                    <MudMenuItem OnClick="() => ModalHelpers.OpenActivityForm(Dialog)">Nuova attività</MudMenuItem>
+                </ChildContent>
+            </MudMenu>
+        }
     </nav>
-}
+</div>
 
 @code
 {
     private bool IsVisible { get; set; } = true;
+    private bool PlusVisible { get; set; } = true;
 
     protected override Task OnInitializedAsync()
     {
@@ -66,10 +57,19 @@
         {
             var location = args.Location.Remove(0, NavigationManager.BaseUri.Length);
 
-            IsVisible = new List<string> { "Calendar", "Users", "PersonalInfo", "Notifications" }
+            var newIsVisible = new List<string> { "Calendar", "Users", "Notifications" }
                 .Contains(location);
+
+            var newPlusVisible = new List<string> { "Calendar", "Users" }
+                .Contains(location);
+
+            if (IsVisible == newIsVisible && PlusVisible == newPlusVisible) return;
+
+            IsVisible = newIsVisible;
+            PlusVisible = newPlusVisible;
             StateHasChanged();
         };
         return Task.CompletedTask;
     }
-}
\ No newline at end of file
+}
+
diff --git a/Template.Shared/Components/Layout/NavMenu.razor.css b/Template.Shared/Components/Layout/NavMenu.razor.css
index da9476f..40836dc 100644
--- a/Template.Shared/Components/Layout/NavMenu.razor.css
+++ b/Template.Shared/Components/Layout/NavMenu.razor.css
@@ -1,17 +1,41 @@
-.navbar {
+.animated-navbar {
     background: transparent;
     position: fixed;
     bottom: 0;
     width: 100%;
     z-index: 1001;
+    transition: all 0.3s ease-in-out;
+}
+
+.animated-navbar.show-nav { transform: translateY(0); }
+
+.animated-navbar.hide-nav { transform: translateY(100%); }
+
+.animated-navbar.with-plus { margin-left: 30px; }
+
+.navbar {
     padding-bottom: 1rem;
     padding-top: 0 !important;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: end;
+    transition: all 0.3s ease-in-out;
+}
+
+.navbar.with-plus { transform: translateX(-30px); }
+
+.navbar.without-plus {
+    transform: translateX(0);
+    justify-content: center;
 }
 
 .container-navbar {
     background: var(--mud-palette-surface);
-    border-radius: 15px;
+    border-radius: 50px;
+    padding: 0 10px;
     box-shadow: var(--custom-box-shadow);
+    transition: all 0.3s ease-in-out;
 }
 
 .nav-item { font-size: 0.9rem; }
@@ -27,23 +51,27 @@
     font-size: 2rem;
 }
 
-    .nav-item ::deep .custom-plus-button:focus .mud-icon-root {
-    transform: rotate(225deg);
+.navbar ::deep .custom-plus-button {
+    background: var(--mud-palette-surface);
+    box-shadow: var(--custom-box-shadow);
+    transition: all 0.3s ease-in-out;
 }
 
+.nav-item ::deep .custom-plus-button:focus .mud-icon-root { transform: rotate(225deg); }
+
 .nav-item ::deep a {
     display: flex;
     align-items: center;
     line-height: 1.2;
     justify-content: center;
-    padding-top: .5rem !important;
-    padding-bottom: .5rem !important;
+    padding-top: .25rem !important;
+    padding-bottom: .25rem !important;
 }
 
 .nav-item ::deep a > div {
     -webkit-transition: all .1s ease-out;
     transition: all .1s ease-out;
-    min-width: 60px;
+    min-width: 75px;
 }
 
 .nav-item ::deep a.active > div { color: var(--mud-palette-primary); }
diff --git a/Template.Shared/Components/Pages/Calendar.razor b/Template.Shared/Components/Pages/Calendar.razor
index d31978f..c3c848a 100644
--- a/Template.Shared/Components/Pages/Calendar.razor
+++ b/Template.Shared/Components/Pages/Calendar.razor
@@ -214,6 +214,11 @@
         }
     }
 
+    protected override void OnInitialized()
+    {
+        PrepareRenderingData();
+    }
+
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
@@ -225,7 +230,6 @@
             _internalMonth = new DateTime(SelectedDate.Year, SelectedDate.Month, 1);
             await LoadMonthData();
 
-            PrepareRenderingData();
             _isInitialized = true;
             ApplyFilter();
             StateHasChanged();
@@ -283,7 +287,7 @@
         _monthDaysData = new DayData[DaysInMonth];
         var today = DateTime.Today;
 
-        for (int d = 1; d <= DaysInMonth; d++)
+        for (var d = 1; d <= DaysInMonth; d++)
         {
             var day = new DateTime(CurrentMonth.Year, CurrentMonth.Month, d);
             var isSelected = day.Date == SelectedDate.Date;
@@ -291,7 +295,7 @@
 
             var cssClass = isSelected ? "selected" : (isToday ? "today" : "");
             var hasEvents = _eventsCache.ContainsKey(day.Date);
-            var eventCategories = hasEvents ? GetFilteredCategoriesForDay(day.Date) : Array.Empty<CategoryData>();
+            var eventCategories = hasEvents ? GetFilteredCategoriesForDay(day.Date) : [];
 
             _monthDaysData[d - 1] = new DayData(day, cssClass, eventCategories.Length > 0, eventCategories);
         }
@@ -303,7 +307,7 @@
         var today = DateTime.Today;
         var culture = new System.Globalization.CultureInfo("it-IT");
 
-        for (int i = 0; i < 7; i++)
+        for (var i = 0; i < 7; i++)
         {
             var day = start.AddDays(i);
             var isSelected = day.Date == SelectedDate.Date;
@@ -312,7 +316,7 @@
             var cssClass = isSelected ? "selected" : (isToday ? "today" : "");
             var dayName = day.ToString("ddd", culture);
             var hasEvents = _eventsCache.ContainsKey(day.Date);
-            var eventCategories = hasEvents ? GetFilteredCategoriesForDay(day.Date) : Array.Empty<CategoryData>();
+            var eventCategories = hasEvents ? GetFilteredCategoriesForDay(day.Date) : [];
 
             _weekDaysData[i] = new DayData(day, cssClass, eventCategories.Length > 0, eventCategories, dayName);
         }
diff --git a/Template.Shared/Components/Pages/Calendar.razor.css b/Template.Shared/Components/Pages/Calendar.razor.css
index 4b2dc0a..b1091fc 100644
--- a/Template.Shared/Components/Pages/Calendar.razor.css
+++ b/Template.Shared/Components/Pages/Calendar.razor.css
@@ -121,7 +121,7 @@
     flex-direction: column;
     -ms-overflow-style: none;
     scrollbar-width: none;
-    padding-bottom: 60px;
+    padding-bottom: 70px;
     height: calc(100% - 130px);
 }
 
diff --git a/Template.Shared/Components/Pages/Login.razor b/Template.Shared/Components/Pages/Login.razor
index b319086..845df71 100644
--- a/Template.Shared/Components/Pages/Login.razor
+++ b/Template.Shared/Components/Pages/Login.razor
@@ -20,24 +20,23 @@ else
                     <MudTextField @bind-Value="UserData.Username" Label="Username" Variant="Variant.Outlined"/>
                 </div>
                 <div class="input-group">
-                    <MudTextField InputType="@_passwordInput" @bind-Value="UserData.Password" Label="Password" Variant="Variant.Outlined" Adornment="Adornment.End" AdornmentIcon="@_passwordInputIcon" OnAdornmentClick="ShowPassword" AdornmentAriaLabel="Show Password" />
+                    <MudTextField InputType="@_passwordInput" @bind-Value="UserData.Password" Label="Password" Variant="Variant.Outlined" Adornment="Adornment.End" AdornmentIcon="@_passwordInputIcon" OnAdornmentClick="ShowPassword" AdornmentAriaLabel="Show Password"/>
                 </div>
                 <div class="input-group mb-2">
-                    <MudTextField @bind-Value="UserData.CodHash" Label="Profilo azienda" Variant="Variant.Outlined" />
+                    <MudTextField @bind-Value="UserData.CodHash" Label="Profilo azienda" Variant="Variant.Outlined"/>
                 </div>
 
                 <MudButton OnClick="SignInUser" Color="Color.Primary" Variant="Variant.Filled">Login</MudButton>
+                @if (_attemptFailed)
+                {
+                    <MudAlert Class="my-3" Dense="true" Severity="Severity.Error" Variant="Variant.Filled">@ErrorMessage</MudAlert>
+                }
             </div>
 
             <div class="my-4 login-footer">
                 <span>Powered by</span>
                 <img src="_content/Template.Shared/images/logoIntegry.svg" class="img-fluid" alt="Integry">
             </div>
-
-            @if (_attemptFailed)
-            {
-                <MudAlert Class="my-3" Dense="true" Severity="Severity.Error" Variant="Variant.Filled">@ErrorMessage</MudAlert>
-            }
         </div>
     </div>
 }
diff --git a/Template.Shared/Components/Pages/Login.razor.css b/Template.Shared/Components/Pages/Login.razor.css
index f7c0617..f452028 100644
--- a/Template.Shared/Components/Pages/Login.razor.css
+++ b/Template.Shared/Components/Pages/Login.razor.css
@@ -2,7 +2,7 @@
     height: 100%;
     display: flex;
     flex-direction: column;
-    background: hsl(from var(--mud-palette-primary) h s 96%);
+    background: var(--mud-palette-surface);
 }
 
 .container-top-logo > span {
@@ -22,6 +22,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
+    z-index: 10;
 }
 
 .login-form-container {
@@ -31,20 +32,17 @@
 }
 
 .container-login {
-    background: var(--mud-palette-surface);
-    border-top-left-radius: 16px;
-    border-top-right-radius: 16px;
     height: 100%;
     display: flex;
     flex-direction: column;
     padding: 4px 16px 16px;
-    box-shadow: 0 -2px 10px rgba(165, 165, 165, 0.5);
+    justify-content: space-between;
 }
 
 .login-footer {
+    width: 100%;
     display: flex;
-    align-items: center;
-    justify-content: flex-end;
+    justify-content: center;
 }
 
 .login-footer span {
diff --git a/Template.Shared/Components/Pages/PersonalInfo.razor b/Template.Shared/Components/Pages/PersonalInfo.razor
index 8100d5e..5235ea6 100644
--- a/Template.Shared/Components/Pages/PersonalInfo.razor
+++ b/Template.Shared/Components/Pages/PersonalInfo.razor
@@ -8,7 +8,7 @@
 @inject INetworkService NetworkService
 @inject IFormFactor FormFactor
 
-<HeaderLayout Title="Profilo"/>
+<HeaderLayout BackTo="Indietro" Back="true" BackOnTop="true" Title="Profilo" ShowProfile="false"/>
 
 <div class="container content">
     <div class="container-primary-info">
diff --git a/Template.Shared/Components/Pages/Settings.razor b/Template.Shared/Components/Pages/Settings.razor
index 61eab28..f1b5455 100644
--- a/Template.Shared/Components/Pages/Settings.razor
+++ b/Template.Shared/Components/Pages/Settings.razor
@@ -2,7 +2,7 @@
 @page "/settings/{BackTo}"
 @using Template.Shared.Components.Layout
 
-<HeaderLayout BackTo="@BackTo" ShowNotifications="false" Back="true" Title="Impostazioni"/>
+<HeaderLayout BackTo="@BackTo" Back="true" Title="Impostazioni"/>
 
 <div class="content">
     
diff --git a/Template.Shared/Components/SingleElements/Modal/ActivityForm.razor b/Template.Shared/Components/SingleElements/Modal/ActivityForm.razor
index da4038d..e4ebb96 100644
--- a/Template.Shared/Components/SingleElements/Modal/ActivityForm.razor
+++ b/Template.Shared/Components/SingleElements/Modal/ActivityForm.razor
@@ -9,7 +9,7 @@
 
 <MudDialog Class="customDialog-form">
     <DialogContent>
-        <HeaderLayout Cancel="true" OnCancel="() => MudDialog.Cancel()" LabelSave="@LabelSave" OnSave="Save" ShowNotifications="false" Title="@(IsNew ? "Nuova" : $"{ActivityModel.ActivityId}")" />
+        <HeaderLayout ShowProfile="false" Cancel="true" OnCancel="() => MudDialog.Cancel()" LabelSave="@LabelSave" OnSave="Save" Title="@(IsNew ? "Nuova" : $"{ActivityModel.ActivityId}")" />
 
         <div class="content">
             <div class="input-card">
diff --git a/Template.Shared/wwwroot/css/app.css b/Template.Shared/wwwroot/css/app.css
index c443f8c..57219df 100644
--- a/Template.Shared/wwwroot/css/app.css
+++ b/Template.Shared/wwwroot/css/app.css
@@ -183,6 +183,16 @@ h1:focus { outline: none; }
     font-size: .9rem;
 }
 
+.container {
+    padding-right: var(--m-page-x) !important;
+    padding-left: var(--m-page-x) !important;
+}
+
+.lm-container {
+    padding-right: calc(var(--m-page-x) * 0.5) !important;
+    padding-left: calc(var(--m-page-x) * 0.5) !important;
+}
+
 @supports (-webkit-touch-callout: none) {
     .status-bar-safe-area {
         display: flex;
diff --git a/Template.Shared/wwwroot/css/default-theme.css b/Template.Shared/wwwroot/css/default-theme.css
index 2b48cfb..bd04eff 100644
--- a/Template.Shared/wwwroot/css/default-theme.css
+++ b/Template.Shared/wwwroot/css/default-theme.css
@@ -6,4 +6,5 @@
     --card-shadow: 5px 5px 10px 0 var(--gray-for-shadow);
     --custom-box-shadow: 1px 2px 5px rgba(165, 165, 165, 0.5);
     --mud-default-borderradius: 12px !important;
+    --m-page-x: 1.25rem;
 }
diff --git a/Template.Shared/wwwroot/js/header.js b/Template.Shared/wwwroot/js/header.js
new file mode 100644
index 0000000..7977944
--- /dev/null
+++ b/Template.Shared/wwwroot/js/header.js
@@ -0,0 +1,26 @@
+window.blazorIosHeader = {
+    init: function () {
+        const largeTitleSection = document.querySelector('.large-title-section');
+        const largeTitle = document.querySelector('.large-title');
+        const centerTitle = document.querySelector('.center-title');
+
+        if (!largeTitleSection || !largeTitle || !centerTitle) return;
+
+        window.addEventListener('scroll', function () {
+            // Soglia simile a iOS: metà della sezione large title
+            const threshold = largeTitleSection.offsetHeight / 2;
+            if (window.scrollY > threshold) {
+                largeTitle.classList.add('hide');
+                centerTitle.classList.add('visible');
+            } else {
+                largeTitle.classList.remove('hide');
+                centerTitle.classList.remove('visible');
+            }
+        });
+    }
+};
+
+// Per compatibilità con il tuo GoBack Blazor
+window.goBack = function () {
+    window.history.back();
+}
\ No newline at end of file