diff --git a/salesbook.Shared/Components/Pages/User.razor b/salesbook.Shared/Components/Pages/User.razor
index 5b72eac..a89e00d 100644
--- a/salesbook.Shared/Components/Pages/User.razor
+++ b/salesbook.Shared/Components/Pages/User.razor
@@ -68,31 +68,40 @@ else
             </div>
         </div>
 
-        @if (PersRif is { Count: > 0 })
-        {
-            <div class="container-pers-rif">
-                <Virtualize Items="PersRif" Context="person">
-                    @{
-                        var index = PersRif.IndexOf(person);
-                        var isLast = index == PersRif.Count - 1;
-                    }
-                    <ContactCard Contact="person" />
-                    @if (!isLast)
-                    {
-                        <div class="divider"></div>
-                    }
-                </Virtualize>
-            </div>
-        }
+        <MudTabs Elevation="2" Rounded="true" PanelClass="pt-6" Style="width: 100%" Centered="true">
+            <MudTabPanel Text="Contatti">
+                @if (PersRif is { Count: > 0 })
+                {
+                    <div class="container-pers-rif">
+                        <Virtualize Items="PersRif" Context="person">
+                            @{
+                                var index = PersRif.IndexOf(person);
+                                var isLast = index == PersRif.Count - 1;
+                            }
+                            <ContactCard Contact="person" />
+                            @if (!isLast)
+                            {
+                                <div class="divider"></div>
+                            }
+                        </Virtualize>
+                    </div>
+                }
 
-        <div class="container-button">
-            <MudButton Class="button-settings infoText"
-                       FullWidth="true"
-                       Size="Size.Medium"
-                       Variant="Variant.Outlined">
-                Aggiungi contatto
-            </MudButton>
-        </div>
+                <div class="container-button">
+                    <MudButton Class="button-settings infoText"
+                               FullWidth="true"
+                               Size="Size.Medium"
+                               Variant="Variant.Outlined">
+                        Aggiungi contatto
+                    </MudButton>
+                </div>
+            </MudTabPanel>
+            <MudTabPanel Text="Commesse">
+                <Virtualize Items="Commesse" Context="commessa">
+                    <CommessaCard Commessa="commessa" />
+                </Virtualize>
+            </MudTabPanel>
+        </MudTabs>
     </div>
 }
 
@@ -101,6 +110,7 @@ else
 
     private AnagClie Anag { get; set; } = new();
     private List<VtbCliePersRif>? PersRif { get; set; }
+    private List<JtbComt> Commesse { get; set; }
 
     private bool IsLoading { get; set; } = true;
 
@@ -113,6 +123,7 @@ else
     {
         Anag = (await ManageData.GetTable<AnagClie>(x => x.CodAnag.Equals(CodAnag))).Last();
         PersRif = await ManageData.GetTable<VtbCliePersRif>(x => x.CodAnag.Equals(Anag.CodAnag));
+        Commesse = await ManageData.GetTable<JtbComt>(x => x.CodAnag != null && x.CodAnag.Equals(CodAnag));
 
         IsLoading = false;
         StateHasChanged();
diff --git a/salesbook.Shared/Components/Pages/Users.razor b/salesbook.Shared/Components/Pages/Users.razor
index b5a3d8f..fe47f91 100644
--- a/salesbook.Shared/Components/Pages/Users.razor
+++ b/salesbook.Shared/Components/Pages/Users.razor
@@ -1,11 +1,13 @@
 @page "/Users"
 @attribute [Authorize]
 @using salesbook.Shared.Components.Layout
+@using salesbook.Shared.Core.Dto
 @using salesbook.Shared.Core.Entity
 @using salesbook.Shared.Core.Interface
+@using salesbook.Shared.Components.SingleElements.BottomSheet
 @inject IManageDataService ManageData
 
-<HeaderLayout Title="Contatti"/>
+<HeaderLayout Title="Contatti" ShowFilter="true" OnFilterToggle="ToggleFilter" />
 
 <div class="container search-box">
     <div class="input-card clearButton">
@@ -31,11 +33,17 @@
     }
 </div>
 
+<FilterUsers @bind-IsSheetVisible="OpenFilter" @bind-Filter="Filter" @bind-Filter:after="ApplyFilter"/>
+
 @code {
     private List<UserDisplayItem> GroupedUserList { get; set; } = [];
     private List<UserDisplayItem> FilteredGroupedUserList { get; set; } = [];
     private string? TextToFilter { get; set; }
 
+    //Filtri
+    private bool OpenFilter { get; set; }
+    private FilterUserDTO Filter { get; set; } = new();
+
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         if (firstRender)
@@ -121,4 +129,15 @@
         FilteredGroupedUserList = result;
     }
 
+    private void ToggleFilter()
+    {
+        OpenFilter = !OpenFilter;
+        StateHasChanged();
+    }
+
+    private void ApplyFilter()
+    {
+
+    }
+
 }
\ No newline at end of file
diff --git a/salesbook.Shared/Components/SingleElements/BottomSheet/FilterUsers.razor b/salesbook.Shared/Components/SingleElements/BottomSheet/FilterUsers.razor
index cc17dc3..e1433c2 100644
--- a/salesbook.Shared/Components/SingleElements/BottomSheet/FilterUsers.razor
+++ b/salesbook.Shared/Components/SingleElements/BottomSheet/FilterUsers.razor
@@ -15,12 +15,6 @@
             <MudIconButton Icon="@Icons.Material.Filled.Close" OnClick="CloseBottomSheet"/>
         </div>
 
-        <div class="input-card clearButton">
-            <MudTextField T="string?" Placeholder="Cerca..." Variant="Variant.Text" @bind-Value="Filter.Text" DebounceInterval="500"/>
-
-            <MudIconButton Class="closeIcon" Icon="@Icons.Material.Filled.Close" OnClick="() => Filter.Text = null"/>
-        </div>
-
         <div class="input-card">
             <div class="form-container">
                 <span class="disable-full-width">Assegnata a</span>
@@ -35,7 +29,7 @@
                                    FullWidth="true" T="string"
                                    Variant="Variant.Text"
                                    Virtualize="true"
-                                   @bind-SelectedValues="Filter.User"
+                                   @* @bind-SelectedValues="Filter.User" *@
                                    Class="customIcon-select"
                                    AdornmentIcon="@Icons.Material.Filled.Code"/>
 
@@ -49,7 +43,7 @@
                 <MudSelectExtended FullWidth="true"
                                    T="string?"
                                    Variant="Variant.Text"
-                                   @bind-Value="Filter.Type"
+                                   @* @bind-Value="Filter.Type" *@
                                    Class="customIcon-select"
                                    AdornmentIcon="@Icons.Material.Filled.Code">
                     @foreach (var type in ActivityType)
@@ -67,7 +61,7 @@
                 <MudSelectExtended FullWidth="true"
                                    T="string?"
                                    Variant="Variant.Text"
-                                   @bind-Value="Filter.Result"
+                                   @* @bind-Value="Filter.Result" *@
                                    Class="customIcon-select"
                                    AdornmentIcon="@Icons.Material.Filled.Code">
                     @foreach (var result in ActivityResult)
@@ -85,7 +79,7 @@
                 <MudSelectExtended FullWidth="true"
                                    T="ActivityCategoryEnum?"
                                    Variant="Variant.Text"
-                                   @bind-Value="Filter.Category"
+                                   @* @bind-Value="Filter.Category" *@
                                    Class="customIcon-select"
                                    AdornmentIcon="@Icons.Material.Filled.Code">
                     @foreach (var category in CategoryList)
@@ -97,7 +91,7 @@
         </div>
 
         <div class="button-section">
-            <MudButton OnClick="() => Filter = new FilterActivityDTO()" Variant="Variant.Outlined" Color="Color.Error">Pulisci</MudButton>
+            <MudButton OnClick="() => Filter = new FilterUserDTO()" Variant="Variant.Outlined" Color="Color.Error">Pulisci</MudButton>
             <MudButton Variant="Variant.Filled" Color="Color.Primary" OnClick="OnFilterButton">Filtra</MudButton>
         </div>
     </div>
@@ -107,8 +101,8 @@
     [Parameter] public bool IsSheetVisible { get; set; }
     [Parameter] public EventCallback<bool> IsSheetVisibleChanged { get; set; }
 
-    [Parameter] public FilterActivityDTO Filter { get; set; }
-    [Parameter] public EventCallback<FilterActivityDTO> FilterChanged { get; set; }
+    [Parameter] public FilterUserDTO Filter { get; set; }
+    [Parameter] public EventCallback<FilterUserDTO> FilterChanged { get; set; }
 
     private List<StbActivityResult> ActivityResult { get; set; } = [];
     private List<StbActivityType> ActivityType { get; set; } = [];
diff --git a/salesbook.Shared/Components/SingleElements/Card/CommessaCard.razor b/salesbook.Shared/Components/SingleElements/Card/CommessaCard.razor
new file mode 100644
index 0000000..5cb7e23
--- /dev/null
+++ b/salesbook.Shared/Components/SingleElements/Card/CommessaCard.razor
@@ -0,0 +1,24 @@
+@using salesbook.Shared.Core.Entity
+
+<div class="activity-card">
+    <div class="activity-left-section">
+        <div class="activity-body-section">
+            <div class="title-section">
+                <MudText Class="activity-title" Typo="Typo.body1" HtmlTag="h3">@Commessa.Descrizione</MudText>
+                <div class="activity-hours-section">
+                    <span class="activity-hours">
+                        @Commessa.CodJcom
+                    </span>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="activity-info-section">
+        <MudChip T="string" Icon="@IconConstants.Chip.User" Size="Size.Small">Stato</MudChip>
+    </div>
+</div>
+
+@code {
+    [Parameter] public JtbComt Commessa { get; set; } = new();
+}
\ No newline at end of file
diff --git a/salesbook.Shared/Components/SingleElements/Card/CommessaCard.razor.css b/salesbook.Shared/Components/SingleElements/Card/CommessaCard.razor.css
new file mode 100644
index 0000000..947044b
--- /dev/null
+++ b/salesbook.Shared/Components/SingleElements/Card/CommessaCard.razor.css
@@ -0,0 +1,59 @@
+.activity-card {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    padding: .5rem .5rem;
+    border-radius: 12px;
+    line-height: normal;
+    box-shadow: var(--custom-box-shadow);
+}
+
+.activity-card.memo { border-left: 5px solid var(--mud-palette-info-darken); }
+
+.activity-card.interna { border-left: 5px solid var(--mud-palette-success-darken); }
+
+.activity-card.commessa { border-left: 5px solid var(--mud-palette-warning); }
+
+.activity-left-section {
+    display: flex;
+    align-items: center;
+    margin-left: 4px;
+}
+
+.title-section {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    width: 100%;
+}
+
+.activity-hours {
+    font-weight: 700;
+    color: var(--mud-palette-text-primary);
+}
+
+.activity-hours-section ::deep .mud-chip { margin: 5px 0 0 !important; }
+
+.activity-body-section {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+}
+
+.title-section ::deep > .activity-title {
+    font-weight: 800 !important;
+    margin: 0 !important;
+    line-height: normal !important;
+    color: var(--mud-palette-text-primary);
+}
+
+.activity-body-section ::deep > .activity-subtitle {
+    color: var(--mud-palette-gray-darker);
+    margin: .2rem 0 !important;
+    line-height: normal !important;
+}
+
+.activity-info-section {
+    display: flex;
+    flex-wrap: wrap;
+}
\ No newline at end of file
diff --git a/salesbook.Shared/Core/Dto/FilterUserDTO.cs b/salesbook.Shared/Core/Dto/FilterUserDTO.cs
new file mode 100644
index 0000000..1567c59
--- /dev/null
+++ b/salesbook.Shared/Core/Dto/FilterUserDTO.cs
@@ -0,0 +1,5 @@
+namespace salesbook.Shared.Core.Dto;
+
+public class FilterUserDTO
+{
+}