Added Security Token for Equipment Maintenance Module

Added Right-Click Option to open modules in a new window

prs.classes/SecurityDescriptors/Desktop_Access.cs

@@ -276,6 +276,11 @@ namespace Comal.Classes.SecurityDescriptors
     public class ViewDesktopEquipmentListScreen : EnabledSecurityDescriptor<DesktopAccessLicence>
     { 
     }
+    
+    [Caption("View Desktop Equipment Maintenance Screen")]
+    public class ViewDesktopEquipmentMaintenanceScreen : EnabledSecurityDescriptor<DesktopAccessLicence>
+    { 
+    }
 
     [Caption("View Desktop Equipment Planner Screen")]
     public class ViewDesktopEquipmentPlannerScreen : EnabledSecurityDescriptor<DesktopAccessLicence>

prs.desktop/MainWindow.xaml

@@ -25,12 +25,13 @@
                      Foreground="{Binding Path=(themes:ThemeManager.WorkspaceForegroundBrush)}"
                      TitleBackground="{Binding Path=(themes:ThemeManager.WorkspaceBackgroundBrush)}"
                      TitleForeground="{Binding Path=(themes:ThemeManager.WorkspaceForegroundBrush)}"
-                     NonActiveBorderBrush="{Binding Path=(themes:ThemeManager.BackstageBackgroundBrush)}">
+                     NonActiveBorderBrush="{Binding Path=(themes:ThemeManager.BackstageBackgroundBrush)}"
+                     >
     <!-- GlowBrush="{Binding Path=(themes:ThemeManager.BackstageBackgroundBrush)}" -->
     <!-- NonActiveGlowBrush="{Binding Path=(themes:ThemeManager.WorkspaceBackgroundBrush)}" -->
-
+    
     <fluent:RibbonWindow.Resources>
-
+        
         <!-- <ResourceDictionary> -->
 
         <SolidColorBrush x:Key="Fluent.Ribbon.Brushes.Backstage.BackButton.Background"
@@ -190,55 +191,59 @@
             <fluent:RibbonTabItem x:Name="ProjectsTab" Header="Projects" IsSelected="False" Visibility="Collapsed">
 
                 <fluent:RibbonGroupBox x:Name="ProjectsActions" Header="Actions">
+                    
                     <fluent:Button Header="Refresh"
                                    LargeIcon="pack://application:,,,/Resources/refresh.png"
-                                   Click="RefreshMenu_Click" MinWidth="60" />
+                                   Click="RefreshMenu_Click" />
+                    
                     <syncfusion:RibbonSeparator />
+                    
                     <fluent:Button x:Name="ProjectsDashboardButton" Header="Dashboards"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="Dashboards_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="ProjectMessagesButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
+                    <fluent:Button x:Name="ProjectMessagesButton"
                                    Header="Notification Centre"
-                                   LargeIcon="pack://application:,,,/Resources/email.png"
-                                   Click="Messages_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/email.png" />
+                    
                     <fluent:Button x:Name="ProjectTaskButton" Header="Task List"
-                                   LargeIcon="pack://application:,,,/Resources/kanban.png"
-                                   Click="Tasks_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kanban.png" />
+                    
                     <fluent:Button x:Name="ProjectAttendanceButton" Header="In/Out Board"
-                                   LargeIcon="pack://application:,,,/Resources/attendance.png"
-                                   Click="Attendance_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/attendance.png" />
+                    
                     <fluent:Button x:Name="ProjectsMapButton" Header="Live Maps"
-                                   LargeIcon="pack://application:,,,/Resources/map.png" Click="Maps_Checked"
-                                   MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/map.png" />
+                    
                     <fluent:Button x:Name="ProjectDailyReportButton" Header="Daily Report"
-                                   LargeIcon="pack://application:,,,/Resources/report.png"
-                                   Click="DailyReport_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/report.png" />
+                    
                     <syncfusion:RibbonSeparator x:Name="ProjectTaskSeparator" />
                     
                     <fluent:Button x:Name="QuotesButton" Header="Quotes"
                                    LargeIcon="pack://application:,,,/Resources/quotation.png"
-                                   Click="Quotes_Checked" MinWidth="60" />
+                                    />
                     
                     <fluent:Button x:Name="ProjectsButton" Header="Projects"
                                    LargeIcon="pack://application:,,,/Resources/project.png"
-                                   Click="Jobs_Checked" MinWidth="60" />
+                                    />
                     
                     <fluent:Button x:Name="ProjectPlannerButton" Header="Project Planner"
                                    LargeIcon="pack://application:,,,/Resources/calendar.png"
-                                   Click="ProjectPlanner_Checked" MinWidth="60" />
+                                    />
                     
                 </fluent:RibbonGroupBox>
                 
-                <fluent:RibbonGroupBox x:Name="ProjectsSetup" Width="Auto" MinWidth="60" Header="Setup" Visibility="Collapsed">
+                <fluent:RibbonGroupBox x:Name="ProjectsSetup" Width="Auto"  Header="Setup" Visibility="Collapsed">
+                    
                     <fluent:Button x:Name="KitsMasterList" Header="Product Kits"
-                                   LargeIcon="pack://application:,,,/Resources/kit.png"
-                                   Click="KitsMasterList_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kit.png" />
+                    
                     <fluent:Button x:Name="CostSheetsMasterList" Header="Cost Sheets"
-                                   LargeIcon="pack://application:,,,/Resources/costsheet.png"
-                                   Click="CostSheetsMasterList_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/costsheet.png" />
+                    
                 </fluent:RibbonGroupBox>
 
-                <fluent:RibbonGroupBox x:Name="ProjectReports" Width="Auto" MinWidth="60" Header="Print" Visibility="Collapsed"/>
+                <fluent:RibbonGroupBox x:Name="ProjectReports" Width="Auto"  Header="Print" Visibility="Collapsed"/>
 
             </fluent:RibbonTabItem>
 
@@ -246,75 +251,54 @@
                                   Visibility="Collapsed">
 
                 <fluent:RibbonGroupBox x:Name="ManufacturingActions" Header="Actions">
+                    
                     <fluent:Button Header="Refresh"
                                    LargeIcon="pack://application:,,,/Resources/refresh.png"
-                                   Click="RefreshMenu_Click" MinWidth="60"/>
+                                   Click="RefreshMenu_Click" />
 
                     <syncfusion:RibbonSeparator x:Name="ManufacturingTaskSeparator" />
+                    
                     <fluent:Button x:Name="ManufacturingDashboardButton" Header="Dashboards"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="Dashboards_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="ManufacturingMessagesButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
+                    <fluent:Button x:Name="ManufacturingMessagesButton"
                                    Header="Notification Centre"
-                                   LargeIcon="pack://application:,,,/Resources/email.png"
-                                   Click="Messages_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/email.png" />
+                    
                     <fluent:Button x:Name="ManufacturingTaskButton" Header="Task List"
-                                   LargeIcon="pack://application:,,,/Resources/kanban.png"
-                                   Click="Tasks_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="ManufacturingAttendanceButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/kanban.png" />
+                    
+                    <fluent:Button x:Name="ManufacturingAttendanceButton"
                                    Header="In/Out Board"
-                                   LargeIcon="pack://application:,,,/Resources/attendance.png"
-                                   Click="Attendance_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/attendance.png" />
+                    
                     <fluent:Button x:Name="ManufacturingMapButton" Header="Live Maps"
-                                   LargeIcon="pack://application:,,,/Resources/map.png" Click="Maps_Checked"
-                                   MinWidth="60" />
-                    <fluent:Button x:Name="ManufacturingDailyReportButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/map.png" />
+                    
+                    <fluent:Button x:Name="ManufacturingDailyReportButton"
                                    Header="Daily Report"
-                                   LargeIcon="pack://application:,,,/Resources/report.png"
-                                   Click="DailyReport_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/report.png" />
                     
                     <syncfusion:RibbonSeparator x:Name="ManufacturingDesignSeparator" />
+                    
                     <fluent:Button x:Name="DesignManagementButton" Header="Design Management"
-                                   LargeIcon="pack://application:,,,/Resources/design.png"
-                                   Click="DesignManagement_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/design.png" />
                     
                     <syncfusion:RibbonSeparator x:Name="ManufacturingActionSeparator" />
+                    
                     <fluent:Button x:Name="FactoryStatusButton" Header="Manufacturing Status"
-                                   LargeIcon="pack://application:,,,/Resources/factory.png"
-                                   Click="ManufacturingMenu_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="FactoryAllocationButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/factory.png" />
+                    
+                    <fluent:Button x:Name="FactoryAllocationButton"
                                    Header="Factory Allocation"
-                                   LargeIcon="pack://application:,,,/Resources/assignments.png"
-                                   Click="FactoryAllocationButton_Click" MinWidth="60" />
-                    <!--<fluent:Button x:Name="FactoryScheduleButton" Header="Factory Schedule" LargeIcon="pack://application:,,,/Resources/clock.png" Click="Schedule_Checked" MinWidth="60"/>-->
+                                   LargeIcon="pack://application:,,,/Resources/assignments.png" />
+                    
                     <fluent:Button x:Name="FactoryFloorButton" Header="Factory Floor"
-                                   LargeIcon="pack://application:,,,/Resources/wrench.png"
-                                   Click="FactoryFloorButton_Click" MinWidth="60" />
-                    <!--<fluent:Button x:Name="FactoryReadyButton" Header="Ready To Go" LargeIcon="pack://application:,,,/Resources/truck.png" Click="FactoryReadyButton_Click"  MinWidth="60"/>-->
+                                   LargeIcon="pack://application:,,,/Resources/wrench.png" />
+                    
                 </fluent:RibbonGroupBox>
 
-                <fluent:RibbonGroupBox x:Name="ManufacturingReports" Width="Auto" MinWidth="60" Header="Print" Visibility="Collapsed"/>
-
-                <!--fluent:RibbonGroupBox x:Name="ManufacturingSetup" Width="Auto" Header="Tools"
-                                       IsLauncherVisible="False">
-                    <fluent:Button x:Name="FactorySettingsButton" Header="Factory Settings"
-                                   LargeIcon="pack://application:,,,/Resources/factorysetup.png"
-                                   Click="FactorySetup_Click" MinWidth="60" />
-                    <fluent:Button x:Name="ManufacturingTemplatesButton" Size="Large"
-                                   Header="Manufacturing Templates"
-                                   LargeIcon="pack://application:,,,/Resources/template.png"
-                                   Click="TemplateSetup_Click" MinWidth="60" />
-                    <fluent:Button x:Name="ManufacturingTrolleysButton" Size="Large"
-                                   Header="Manufacturing Trolleys"
-                                   LargeIcon="pack://application:,,,/Resources/trolley.png"
-                                   Click="TrolleySetup_Click" MinWidth="60" />
-                    <fluent:Button x:Name="ManufacturingLostTimeButton" Size="Large"
-                                   Header="Lost Time Types"
-                                   LargeIcon="pack://application:,,,/Resources/smiley.png"
-                                   Click="LostTimeSetup_Click" MinWidth="60" />
-                    <! - - <fluent:Button x:Name="ManufacturingTransferButton" Header="Transfer Settings" LargeIcon="pack://application:,,,/Resources/warning.png" Click="ManufacturingTransferButton_Click" MinWidth="60"/>
-                    <fluent:Button x:Name="RebuildPacketsButton" Header="Rebuild Packets" LargeIcon="pack://application:,,,/Resources/warning.png" Click="RebuildPacketsButton_Click" MinWidth="60"/> - - >
-                </fluent:RibbonGroupBox-->
+                <fluent:RibbonGroupBox x:Name="ManufacturingReports" Width="Auto"  Header="Print" Visibility="Collapsed"/>
 
             </fluent:RibbonTabItem>
 
@@ -322,130 +306,109 @@
                                   Visibility="Collapsed">
 
                 <fluent:RibbonGroupBox x:Name="ProductActions" Width="Auto" Header="Actions">
+                    
                     <fluent:Button Header="Refresh"
                                    LargeIcon="pack://application:,,,/Resources/refresh.png"
-                                   Click="RefreshMenu_Click" MinWidth="60" />
+                                   Click="RefreshMenu_Click" />
+                    
                     <syncfusion:RibbonSeparator />
+                    
                     <fluent:Button x:Name="ProductsDashboardButton" Header="Dashboards"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="Dashboards_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="ProductsMessagesButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
+                    <fluent:Button x:Name="ProductsMessagesButton"
                                    Header="Notification Centre"
-                                   LargeIcon="pack://application:,,,/Resources/email.png"
-                                   Click="Messages_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/email.png" />
+                    
                     <fluent:Button x:Name="ProductsTaskButton" Header="Task List"
-                                   LargeIcon="pack://application:,,,/Resources/kanban.png"
-                                   Click="Tasks_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kanban.png" />
+                    
                     <fluent:Button x:Name="ProductsAttendanceButton" Header="In/Out Board"
-                                   LargeIcon="pack://application:,,,/Resources/attendance.png"
-                                   Click="Attendance_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/attendance.png" />
+                    
                     <fluent:Button x:Name="ProductsMapButton" Header="Live Maps"
-                                   LargeIcon="pack://application:,,,/Resources/map.png" Click="Maps_Checked"
-                                   MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/map.png" />
+                    
                     <fluent:Button x:Name="ProductsDailyReportButton" Header="Daily Report"
-                                   LargeIcon="pack://application:,,,/Resources/report.png"
-                                   Click="DailyReport_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/report.png" />
+                    
                     <syncfusion:RibbonSeparator x:Name="ProductsTaskSeparator" />
+                    
                     <fluent:Button x:Name="ProductsMasterList" Header="Product List"
-                                   LargeIcon="pack://application:,,,/Resources/product.png"
-                                   Click="Products_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/product.png" />
+                    
                     <fluent:Button x:Name="StockLocationList" Header="Stock Locations"
-                                   LargeIcon="pack://application:,,,/Resources/parcel.png"
-                                   Click="StockLocations_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/parcel.png" />
+                    
                     <fluent:Button x:Name="StockMovementList" Header="Stock Movements"
-                                   LargeIcon="pack://application:,,,/Resources/forklift.png"
-                                   Click="StockMovements_Checked" MinWidth="60" />                    
+                                   LargeIcon="pack://application:,,,/Resources/forklift.png" />
+                    
                     <fluent:Button x:Name="StockForecastButton" Header="Stock Forecast"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="StockForecastButton_Clicked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
                     <fluent:Button x:Name="ReservationManagementButton" Header="Reservation Management"
-                                   LargeIcon="pack://application:,,,/Resources/requisition.png"
-                                   Click="ReservationManagementButton_Clicked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/requisition.png" />
+                    
                 </fluent:RibbonGroupBox>
 
-                <fluent:RibbonGroupBox x:Name="ProductReports" Width="Auto" MinWidth="60" Header="Print" Visibility="Collapsed"/>
-
-                <!--fluent:RibbonGroupBox x:Name="ProductSetup" Width="Auto" Header="Tools"
-                                       IsLauncherVisible="False">
-                    <fluent:Button x:Name="ProductDimensionUnitsList" Size="Large"
-                                   Header="Units of Measure"
-                                   LargeIcon="pack://application:,,,/Resources/unitofmeasure.png"
-                                   Click="ProductDimensionUnitsList_Click" MinWidth="60" />
-                    <fluent:Button x:Name="ProductGroupsList" Header="Product Groups"
-                                   LargeIcon="pack://application:,,,/Resources/productgroup.png"
-                                   Click="ProductGroupsList_Click" MinWidth="60" />
-                    <fluent:Button x:Name="ProductStylesList" Header="Product Styles"
-                                   LargeIcon="pack://application:,,,/Resources/palette.png"
-                                   Click="ProductStylesList_Click" MinWidth="60" />
-                    <fluent:Button x:Name="StockAreasList" Header="Stock Areas"
-                                   LargeIcon="pack://application:,,,/Resources/rack.png"
-                                   Click="StockAreasList_Click" MinWidth="60" />
-                    <fluent:Button x:Name="StockWarehouseList" Header="Stock Warehouses"
-                                   LargeIcon="pack://application:,,,/Resources/factorysetup.png"
-                                   Click="StockWarehouseList_Click" MinWidth="60" />
-                </fluent:RibbonGroupBox-->
+                <fluent:RibbonGroupBox x:Name="ProductReports" Width="Auto"  Header="Print" Visibility="Collapsed"/>
 
             </fluent:RibbonTabItem>
 
             <fluent:RibbonTabItem x:Name="LogisticsTab" Header="Logistics" IsSelected="False" Visibility="Collapsed">
 
                 <fluent:RibbonGroupBox x:Name="LogisticsActions" Header="Actions">
+                    
                     <fluent:Button Header="Refresh"
                                    LargeIcon="pack://application:,,,/Resources/refresh.png"
-                                   Click="RefreshMenu_Click" MinWidth="60" />
+                                   Click="RefreshMenu_Click"  />
+                    
                     <syncfusion:RibbonSeparator />
+                    
                     <fluent:Button x:Name="LogisticsDashboardButton" Header="Dashboards"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="Dashboards_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="LogisticsMessagesButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
+                    <fluent:Button x:Name="LogisticsMessagesButton"
                                    Header="Notification Centre"
-                                   LargeIcon="pack://application:,,,/Resources/email.png"
-                                   Click="Messages_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/email.png" />
+                    
                     <fluent:Button x:Name="LogisticsTaskButton" Header="Task List"
-                                   LargeIcon="pack://application:,,,/Resources/kanban.png"
-                                   Click="Tasks_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kanban.png" />
+                    
                     <fluent:Button x:Name="LogisticsAttendanceButton" Header="In/Out Board"
-                                   LargeIcon="pack://application:,,,/Resources/attendance.png"
-                                   Click="Attendance_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/attendance.png" />
+                    
                     <fluent:Button x:Name="LogisticsMapButton" Header="Live Maps"
-                                   LargeIcon="pack://application:,,,/Resources/map.png" Click="Maps_Checked"
-                                   MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/map.png" />
+                    
                     <fluent:Button x:Name="LogisticsDailyReportButton" Header="Daily Report"
-                                   LargeIcon="pack://application:,,,/Resources/report.png"
-                                   Click="DailyReport_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/report.png" />
+                    
                     <syncfusion:RibbonSeparator x:Name="LogisticsTaskSeparator1" />
+                    
                     <fluent:Button x:Name="ReadyToGoItemsButton" Header="Ready To Go"
-                                   LargeIcon="pack://application:,,,/Resources/truck.png"
-                                   Click="ReadyToGoMenu_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/truck.png" />
+                    
                     <fluent:Button x:Name="DispatchButton" Header="Rack List"
-                                   LargeIcon="pack://application:,,,/Resources/barcode.png"
-                                   Click="DispatchMenu_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/barcode.png" />
+                    
                     <fluent:Button x:Name="RequisitionsButton" Header="Picking Lists"
-                                   LargeIcon="pack://application:,,,/Resources/box.png"
-                                   Click="Requisitions_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/box.png" />
+                    
                     <fluent:Button x:Name="DeliveriesButton" Header="Deliveries"
-                                   LargeIcon="pack://application:,,,/Resources/truck.png"
-                                   Click="DeliveriesButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/truck.png" />
+                    
                     <fluent:Button x:Name="DeliveredItemsButton" Header="Delivered On Site"
-                                   LargeIcon="pack://application:,,,/Resources/lifter.png"
-                                   Click="DeliveredOnSiteMenu_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/lifter.png" />
+                    
                     <syncfusion:RibbonSeparator x:Name="LogisticsTaskSeparator2" />
+                    
                     <fluent:Button x:Name="ConsignmentButton" Header="Incoming Consignments"
-                                   LargeIcon="pack://application:,,,/Resources/consignment.png"
-                                   Click="ConsignmentButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/consignment.png" />
+                    
                 </fluent:RibbonGroupBox>
 
-                <fluent:RibbonGroupBox x:Name="LogisticsReports" Width="Auto" MinWidth="60" Header="Print" Visibility="Collapsed"/>
-
-                <!--fluent:RibbonGroupBox x:Name="LogisticsSetup" Width="Auto" Header="Tools"
-                                       IsLauncherVisible="False">
-                    <fluent:Button x:Name="DeliveryTypesButton" Header="Delivery Types"
-                                   LargeIcon="pack://application:,,,/Resources/truck.png"
-                                   Click="DeliveryTypesButton_Click" MinWidth="60" />
-                    <fluent:Button x:Name="ConsignmentTypesButton" Header="Consignment Types"
-                                   LargeIcon="pack://application:,,,/Resources/service.png"
-                                   Click="ConsignmentTypesButton_Click" MinWidth="60" />
-                </fluent:RibbonGroupBox-->
+                <fluent:RibbonGroupBox x:Name="LogisticsReports" Width="Auto"  Header="Print" Visibility="Collapsed"/>
 
             </fluent:RibbonTabItem>
 
@@ -453,181 +416,129 @@
                                   Visibility="Collapsed">
 
                 <fluent:RibbonGroupBox x:Name="HumanResourcesActions" Header="Actions">
+                    
                     <fluent:Button Header="Refresh"
                                    LargeIcon="pack://application:,,,/Resources/refresh.png"
-                                   Click="RefreshMenu_Click" MinWidth="60" />
+                                   Click="RefreshMenu_Click"  />
+                    
                     <syncfusion:RibbonSeparator />
+                    
                     <fluent:Button x:Name="HumanResourcesDashboardButton" Header="Dashboards"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="Dashboards_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="HumanResourcesMessagesButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
+                    <fluent:Button x:Name="HumanResourcesMessagesButton"
                                    Header="Notification Centre"
-                                   LargeIcon="pack://application:,,,/Resources/email.png"
-                                   Click="Messages_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/email.png" />
+                    
                     <fluent:Button x:Name="HumanResourcesTaskButton" Header="Task List"
-                                   LargeIcon="pack://application:,,,/Resources/kanban.png"
-                                   Click="Tasks_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="HumanResourcesAttendanceButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/kanban.png" />
+                    
+                    <fluent:Button x:Name="HumanResourcesAttendanceButton"
                                    Header="In/Out Board"
-                                   LargeIcon="pack://application:,,,/Resources/attendance.png"
-                                   Click="Attendance_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/attendance.png" />
+                    
                     <fluent:Button x:Name="HumanResourcesMapButton" Header="Live Maps"
-                                   LargeIcon="pack://application:,,,/Resources/map.png" Click="Maps_Checked"
-                                   MinWidth="60" />
-                    <fluent:Button x:Name="HumanResourcesDailyReportButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/map.png" />
+                    
+                    <fluent:Button x:Name="HumanResourcesDailyReportButton"
                                    Header="Daily Report"
-                                   LargeIcon="pack://application:,,,/Resources/report.png"
-                                   Click="DailyReport_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/report.png" />
+                    
                     <syncfusion:RibbonSeparator x:Name="HumanResourcesTaskSeparator" />
+                    
                     <fluent:Button x:Name="CalendarButton" Header="Calendar"
-                                   LargeIcon="pack://application:,,,/Resources/assignments.png"
-                                   Click="CalendarButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/assignments.png" />
+                    
                     <fluent:Button x:Name="EmployeePlannerButton" Header="Employee Planner"
-                                   LargeIcon="pack://application:,,,/Resources/calendar.png"
-                                   Click="EmployeePlannerButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/calendar.png" />
+                    
                     <fluent:Button x:Name="TimesheetsButton" Header="Staff TimeSheets"
-                                   LargeIcon="pack://application:,,,/Resources/clock.png"
-                                   Click="Timesheets_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/clock.png" />
+                    
                     <fluent:Button x:Name="LeaveRequestsButton" Header="Leave Requests"
-                                   LargeIcon="pack://application:,,,/Resources/leave.png"
-                                   Click="LeaveRequestsButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/leave.png" />
+                    
                     <fluent:Button x:Name="MeetingsButton" Header="Meetings"
-                                   LargeIcon="pack://application:,,,/Resources/employees.png"
-                                   Click="MeetingsButton_Click" MinWidth="60" />
-
+                                   LargeIcon="pack://application:,,,/Resources/employees.png" />
                     
                     <syncfusion:RibbonSeparator x:Name="HumanResourcesSetupSeparator1" />
                     
                     <fluent:Button x:Name="UsersButton" Header="User Accounts"
-                                   LargeIcon="pack://application:,,,/Resources/user.png"
-                                   Click="UserSetup_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/user.png" />
+                    
                     <fluent:Button x:Name="EmployeesButton" Header="Employee List"
-                                   LargeIcon="pack://application:,,,/Resources/employee.png"
-                                   Click="Employees_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/employee.png" />
+                    
                     <fluent:Button x:Name="OrgChartButton" Header="Org Chart"
-                                   LargeIcon="pack://application:,,,/Resources/orgchart.png"
-                                   Click="OrgChartButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/orgchart.png" />
+                    
                 </fluent:RibbonGroupBox>
 
-                <fluent:RibbonGroupBox x:Name="HumanResourcesReports" Width="Auto" MinWidth="60" Header="Print" Visibility="Collapsed"/>
-
-                <!--fluent:RibbonGroupBox x:Name="HumanResourcesSetup" Width="Auto" Header="Tools"
-                                       IsLauncherVisible="False">
-                    <fluent:Button x:Name="SecurityGroupsButton" Header="Security Groups"
-                                   LargeIcon="pack://application:,,,/Resources/securitygroup.png"
-                                   Click="SecurityGroupsButton_Click" MinWidth="60" />
-                    <fluent:Button x:Name="EmployeeGroupsButton" Header="Employee Groups"
-                                   LargeIcon="pack://application:,,,/Resources/employees.png"
-                                   Click="GroupsSetup_Click" MinWidth="60" />
-                    <fluent:Button x:Name="EmployeePositionsButton" Header="Positions"
-                                   LargeIcon="pack://application:,,,/Resources/position.png"
-                                   Click="PositionsSetup_Click" MinWidth="60" />
-                    <fluent:Button x:Name="EmployeeRolesButton" Header="Roles"
-                                   LargeIcon="pack://application:,,,/Resources/employeerole.png"
-                                   Click="RolesSetup_Click" MinWidth="60" />
-                    <fluent:Button x:Name="EmployeeTeamsButton" Header="Teams"
-                                   LargeIcon="pack://application:,,,/Resources/team.png"
-                                   Click="EmployeeTeamsButton_Click" MinWidth="60" />
-                    <fluent:Button x:Name="EmployeeActivitiesButton" Header="Activities"
-                                   LargeIcon="pack://application:,,,/Resources/quality.png"
-                                   Click="ActivityMenu_Click" MinWidth="60" />
-                    <fluent:Button x:Name="EmployeeQualificationsButton" Size="Large"
-                                   Header="Qualifications"
-                                   LargeIcon="pack://application:,,,/Resources/certificate.png"
-                                   Click="QualificationMenu_Click" MinWidth="60" />
-                    <syncfusion:RibbonSeparator x:Name="HumanResourcesSetupSeparator2" />
-                    <fluent:Button x:Name="OvertimeRulesButton" Header="Overtime Rules"
-                                   LargeIcon="pack://application:,,,/Resources/overtime.png"
-                                   Click="OvertimeRulesButton_Click" MinWidth="60" />
-                    <fluent:Button x:Name="StandardLeaveButton" Header="Standard Leave"
-                                   LargeIcon="pack://application:,,,/Resources/fireworks.png"
-                                   Click="StandardLeaveButton_Click" MinWidth="60" />
-                </fluent:RibbonGroupBox-->
-
+                <fluent:RibbonGroupBox x:Name="HumanResourcesReports" Width="Auto"  Header="Print" Visibility="Collapsed"/>
+                
             </fluent:RibbonTabItem>
 
             <fluent:RibbonTabItem x:Name="AccountsTab" Header="Accounts" IsSelected="False" Visibility="Collapsed">
 
                 <fluent:RibbonGroupBox x:Name="AccountsActions" Header="Actions">
+                    
                     <fluent:Button Header="Refresh"
                                    LargeIcon="pack://application:,,,/Resources/refresh.png"
-                                   Click="RefreshMenu_Click" MinWidth="60" />
+                                   Click="RefreshMenu_Click" />
+                    
                     <syncfusion:RibbonSeparator />
+                    
                     <fluent:Button x:Name="AccountsDashboardButton" Header="Dashboards"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="Dashboards_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="AccountsMessagesButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
+                    <fluent:Button x:Name="AccountsMessagesButton"
                                    Header="Notification Centre"
-                                   LargeIcon="pack://application:,,,/Resources/email.png"
-                                   Click="Messages_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/email.png" />
+                    
                     <fluent:Button x:Name="AccountsTaskButton" Header="Task List"
-                                   LargeIcon="pack://application:,,,/Resources/kanban.png"
-                                   Click="Tasks_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kanban.png" />
+                    
                     <fluent:Button x:Name="AccountsAttendanceButton" Header="In/Out Board"
-                                   LargeIcon="pack://application:,,,/Resources/attendance.png"
-                                   Click="Attendance_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/attendance.png" />
+                    
                     <fluent:Button x:Name="AccountsMapButton" Header="Live Maps"
-                                   LargeIcon="pack://application:,,,/Resources/map.png" Click="Maps_Checked"
-                                   MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/map.png" />
+                    
                     <fluent:Button x:Name="AccountsDailyReportButton" Header="Daily Report"
-                                   LargeIcon="pack://application:,,,/Resources/report.png"
-                                   Click="DailyReport_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/report.png" />
+                    
                     <syncfusion:RibbonSeparator x:Name="AccountsTaskSeparator1" />
+                    
                     <fluent:Button x:Name="CustomerList" Header="Customers"
-                                   LargeIcon="pack://application:,,,/Resources/customer.png"
-                                   Click="CustomerList_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/customer.png" />
+                    
                     <fluent:Button x:Name="InvoiceList" Header="Invoices"
-                                   LargeIcon="pack://application:,,,/Resources/invoice.png"
-                                   Click="InvoiceList_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/invoice.png" />
+                    
                     <fluent:Button x:Name="ReceiptList" Header="Receipts"
-                                   LargeIcon="pack://application:,,,/Resources/receipt.png"
-                                   Click="ReceiptList_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/receipt.png" />
+                    
                     <syncfusion:RibbonSeparator x:Name="AccountsTaskSeparator2" />
+                    
                     <fluent:Button x:Name="SupplierList" Header="Suppliers"
-                                   LargeIcon="pack://application:,,,/Resources/supplier.png"
-                                   Click="SupplierList_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/supplier.png" />
+                    
                     <fluent:Button x:Name="AccountsDataButton" Header="Data Entry"
-                                   LargeIcon="pack://application:,,,/Resources/pencil.png"
-                                   Click="DataEntry_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/pencil.png" />
+                    
                     <fluent:Button x:Name="PurchasesList" Header="Purchase Orders"
-                                   LargeIcon="pack://application:,,,/Resources/purchase.png"
-                                   Click="PurchasesList_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/purchase.png" />
+                    
                     <fluent:Button x:Name="BillsList" Header="Bills"
-                                   LargeIcon="pack://application:,,,/Resources/bill.png"
-                                   Click="BillsList_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/bill.png" />
+                    
                     <fluent:Button x:Name="PaymentsList" Header="Payments"
-                                   LargeIcon="pack://application:,,,/Resources/payment.png"
-                                   Click="PaymentsList_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/payment.png" />
+                    
                 </fluent:RibbonGroupBox>
 
-                <fluent:RibbonGroupBox x:Name="AccountsReports" Width="Auto" MinWidth="60" Header="Print" Visibility="Collapsed"/>
-
-                <!--fluent:RibbonGroupBox x:Name="AccountsSetup" Width="Auto" Header="Tools"
-                                       IsLauncherVisible="False">
-                    <fluent:Button x:Name="ContactTypeList" Header="Contact Types"
-                                   LargeIcon="pack://application:,,,/Resources/contacttype.png"
-                                   Click="ContactTypeList_Click" MinWidth="60" />
-                    <fluent:Button x:Name="TaxCodeList" Header="Tax Codes"
-                                   LargeIcon="pack://application:,,,/Resources/taxcode.png"
-                                   Click="TaxCodeList_Click" MinWidth="60" />
-                    <fluent:Button x:Name="ReceiptTypeList" Header="Receipt Types"
-                                   LargeIcon="pack://application:,,,/Resources/receipt.png"
-                                   Click="ReceiptTypeList_Click" MinWidth="60" />
-                    <fluent:Button x:Name="PaymentTypeList" Header="Payment Types"
-                                   LargeIcon="pack://application:,,,/Resources/payment.png"
-                                   Click="PaymentTypeList_Click" MinWidth="60" />
-                    <fluent:Button x:Name="CostCentresList" Header="Cost Centres"
-                                   LargeIcon="pack://application:,,,/Resources/costcentre.png"
-                                   Click="CostCentresList_Click" MinWidth="60" />
-                    <fluent:Button x:Name="GLCodesList" Header="GL Codes"
-                                   LargeIcon="pack://application:,,,/Resources/glcode.png"
-                                   Click="GLCodesList_Click" MinWidth="60" />
-                    <fluent:Button x:Name="PurchaseOrderCategoriesList" Size="Large"
-                                   Header="Purchase Order Categories"
-                                   LargeIcon="pack://application:,,,/Resources/service.png"
-                                   Click="PurchaseOrderCategoriesButton_Click" MinWidth="60" />
-                </fluent:RibbonGroupBox-->
-
+                <fluent:RibbonGroupBox x:Name="AccountsReports" Width="Auto"  Header="Print" Visibility="Collapsed"/>
+                
             </fluent:RibbonTabItem>
 
             <fluent:RibbonTabItem x:Name="EquipmentTab" Header="Equipment" IsSelected="True" Visibility="Collapsed">
@@ -636,59 +547,46 @@
 
                     <fluent:Button Header="Refresh"
                                    LargeIcon="pack://application:,,,/Resources/refresh.png"
-                                   Click="RefreshMenu_Click" MinWidth="60" />
+                                   Click="RefreshMenu_Click" />
+                    
                     <syncfusion:RibbonSeparator />
+                    
                     <fluent:Button x:Name="EquipmentDashboardButton" Header="Dashboards"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="Dashboards_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="EquipmentMessagesButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
+                    <fluent:Button x:Name="EquipmentMessagesButton"
                                    Header="Notification Centre"
-                                   LargeIcon="pack://application:,,,/Resources/email.png"
-                                   Click="Messages_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/email.png" />
+                    
                     <fluent:Button x:Name="EquipmentTaskButton" Header="Task List"
-                                   LargeIcon="pack://application:,,,/Resources/kanban.png"
-                                   Click="Tasks_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kanban.png" />
+                    
                     <fluent:Button x:Name="EquipmentAttendanceButton" Header="In/Out Board"
-                                   LargeIcon="pack://application:,,,/Resources/attendance.png"
-                                   Click="Attendance_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/attendance.png" />
+                    
                     <fluent:Button x:Name="EquipmentMapButton" Header="Live Maps"
-                                   LargeIcon="pack://application:,,,/Resources/map.png" Click="Maps_Checked"
-                                   MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/map.png" />
+                    
                     <fluent:Button x:Name="EquipmentDailyReportButton" Header="Daily Report"
-                                   LargeIcon="pack://application:,,,/Resources/report.png"
-                                   Click="DailyReport_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/report.png" />
+                    
                     <syncfusion:RibbonSeparator x:Name="EquipmentTaskSeparator" />
+                    
                     <fluent:Button x:Name="EquipmentButton" Header="Equipment List"
-                                   LargeIcon="pack://application:,,,/Resources/specifications.png"
-                                   Click="Equipment_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/specifications.png"/>
+                    
                     <fluent:Button x:Name="EquipmentMaintenanceButton" Header="Planned Maintenance"
-                                   LargeIcon="pack://application:,,,/Resources/service.png"
-                                   Click="EquipmentMaintenance_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/service.png" />
+                    
                     <fluent:Button x:Name="EquipmentPlannerButton" Header="Equipment Planner"
-                                   LargeIcon="pack://application:,,,/Resources/calendar.png"
-                                   Click="EquipmentPlannerButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/calendar.png" />
+                    
                     <fluent:Button x:Name="TrackersMasterList" Header="GPS Trackers"
-                                   LargeIcon="pack://application:,,,/Resources/milestone.png"
-                                   Click="Trackers_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/milestone.png" />
+                    
                 </fluent:RibbonGroupBox>
 
-                <fluent:RibbonGroupBox x:Name="EquipmentReports" Width="Auto" MinWidth="60" Header="Print" Visibility="Collapsed"/>
-
-                <!--fluent:RibbonGroupBox x:Name="EquipmentSetup" Width="Auto" Header="Tools"
-                                       IsLauncherVisible="False">
-                    <fluent:Button x:Name="TrackerTypesMasterList" Header="Tracker Types"
-                                   LargeIcon="pack://application:,,,/Resources/milestone.png"
-                                   Click="TrackerTypes_Click" MinWidth="60" />
-                    <fluent:Button x:Name="StickersMasterList" Header="Stickers"
-                                   LargeIcon="pack://application:,,,/Resources/barcode.png"
-                                   Click="Stickers_Click" MinWidth="60" />
-                    <fluent:Button x:Name="DigitalKeysMasterList" Header="Digital Keys"
-                                   LargeIcon="pack://application:,,,/Resources/key.png"
-                                   Click="DigitalKeys_Click" MinWidth="60" />
-                    <fluent:Button x:Name="EquipmentGroupList" Header="Equipment Groups"
-                                   LargeIcon="pack://application:,,,/Resources/specifications.png"
-                                   Click="EquipmentGroupList_Click" MinWidth="60" />
-                </fluent:RibbonGroupBox-->
+                <fluent:RibbonGroupBox x:Name="EquipmentReports" Width="Auto"  Header="Print" Visibility="Collapsed"/>
 
             </fluent:RibbonTabItem>
 
@@ -697,88 +595,95 @@
 
                     <fluent:Button Header="Refresh"
                                    LargeIcon="pack://application:,,,/Resources/refresh.png"
-                                   Click="RefreshMenu_Click" MinWidth="60" />
+                                   Click="RefreshMenu_Click" />
+                    
                     <syncfusion:RibbonSeparator />
+                    
                     <fluent:Button x:Name="DigitalFormsDashboardButton" Header="Dashboards"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="Dashboards_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="DigitalFormsMessagesButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
+                    <fluent:Button x:Name="DigitalFormsMessagesButton"
                                    Header="Notification Centre"
-                                   LargeIcon="pack://application:,,,/Resources/email.png"
-                                   Click="Messages_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/email.png" />
+                    
                     <fluent:Button x:Name="DigitalFormsTaskButton" Header="Task List"
-                                   LargeIcon="pack://application:,,,/Resources/kanban.png"
-                                   Click="Tasks_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kanban.png" />
+                    
                     <fluent:Button x:Name="DigitalFormsAttendanceButton" Header="In/Out Board"
-                                   LargeIcon="pack://application:,,,/Resources/attendance.png"
-                                   Click="Attendance_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/attendance.png" />
+                    
                     <fluent:Button x:Name="DigitalFormsMapButton" Header="Live Maps"
-                                   LargeIcon="pack://application:,,,/Resources/map.png" Click="Maps_Checked"
-                                   MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/map.png" />
+                    
                     <fluent:Button x:Name="DigitalFormsDailyReportButton" Header="Daily Report"
-                                   LargeIcon="pack://application:,,,/Resources/report.png"
-                                   Click="DailyReport_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/report.png" />
+                    
                     <syncfusion:RibbonSeparator x:Name="DigitalFormsTaskSeparator" />
+                    
                     <fluent:Button x:Name="DigitalFormsFormsLibraryButton" Header="Forms Library"
-                                   LargeIcon="pack://application:,,,/Resources/formslibrary.png"
-                                   Click="DigitalFormsFormsLibraryButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/formslibrary.png" />
+                    
                     <fluent:Button x:Name="DigitalFormsCompletedFormsButton" Header="Forms Dashboard"
-                                   LargeIcon="pack://application:,,,/Resources/forminstance.png"
-                                   Click="DigitalFormsCompletedFormsButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/forminstance.png" />
+                    
                 </fluent:RibbonGroupBox>
 
-                <fluent:RibbonGroupBox x:Name="DigitalFormReports" Width="Auto" MinWidth="60" Header="Print" Visibility="Collapsed"/>
+                <fluent:RibbonGroupBox x:Name="DigitalFormReports" Width="Auto"  Header="Print" Visibility="Collapsed"/>
             </fluent:RibbonTabItem>
 
             <fluent:RibbonTabItem x:Name="DashboardsTab" Header="Dashboards" IsSelected="False" Visibility="Collapsed">
 
                 <fluent:RibbonGroupBox x:Name="DashboardsActions" Header="Actions">
+                    
                     <fluent:Button Header="Refresh"
                                    LargeIcon="pack://application:,,,/Resources/refresh.png"
-                                   Click="RefreshMenu_Click" MinWidth="60" />
+                                   Click="RefreshMenu_Click" />
+                    
                     <syncfusion:RibbonSeparator />
+                    
                     <fluent:Button x:Name="DashboardsDashboardButton" Header="Dashboards"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="Dashboards_Checked" MinWidth="60" />
-                    <fluent:Button x:Name="DashboardMessagesButton" Size="Large"
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
+                    <fluent:Button x:Name="DashboardMessagesButton"
                                    Header="Notification Centre"
-                                   LargeIcon="pack://application:,,,/Resources/email.png"
-                                   Click="Messages_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/email.png" />
+                    
                     <fluent:Button x:Name="DashboardsTaskButton" Header="Task List"
-                                   LargeIcon="pack://application:,,,/Resources/kanban.png"
-                                   Click="Tasks_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kanban.png" />
+                    
                     <fluent:Button x:Name="DashboardsAttendanceButton" Header="In/Out Board"
-                                   LargeIcon="pack://application:,,,/Resources/attendance.png"
-                                   Click="Attendance_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/attendance.png" />
+                    
                     <fluent:Button x:Name="DashboardsMapButton" Header="Live Maps"
-                                   LargeIcon="pack://application:,,,/Resources/map.png" Click="Maps_Checked"
-                                   MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/map.png" />
+                    
                     <fluent:Button x:Name="DashboardsDailyReportButton" Header="Daily Report"
-                                   LargeIcon="pack://application:,,,/Resources/report.png"
-                                   Click="DailyReport_Checked" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/report.png" />
+                    
                     <syncfusion:RibbonSeparator x:Name="DashboardsTaskSeparator" />
+                    
                     <!--This is where the static dashboards need to go-->
                     <fluent:Button x:Name="FactoryProductivityButton" Header="Factory KPIs"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="FactoryProductivityButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
                     <fluent:Button x:Name="TemplateAnalysisButton" Header="Template Analysis"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="TemplateAnalysisButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
                     <fluent:Button x:Name="FactoryAnalysisButton" Header="Factory Analysis"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="FactoryAnalysisButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
                     <fluent:Button x:Name="DatabaseActivityButton" Header="Database Activity"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="DatabaseActivityButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
                     <fluent:Button x:Name="UserActivityButton" Header="User Activity"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="UserActivityButton_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
                     <fluent:Button x:Name="QuickStatusButton" Header="Quick Status"
-                                   LargeIcon="pack://application:,,,/Resources/kpi.png"
-                                   Click="QuickStatus_Click" MinWidth="60" />
+                                   LargeIcon="pack://application:,,,/Resources/kpi.png" />
+                    
                 </fluent:RibbonGroupBox>
 
-                <fluent:RibbonGroupBox x:Name="DashboardsReports" Width="Auto" MinWidth="60" Header="Print" Visibility="Collapsed"/>
+                <fluent:RibbonGroupBox x:Name="DashboardsReports" Width="Auto"  Header="Print" Visibility="Collapsed"/>
 
             </fluent:RibbonTabItem>
 
@@ -1111,18 +1016,16 @@
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />                          
                         <ColumnDefinition Width="Auto" />                       
                         <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="100" />
+                        <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
+                
                     <Label Grid.Column="0" x:Name="ProfileName" Content="" HorizontalContentAlignment="Center"
                            VerticalContentAlignment="Center" Foreground="WhiteSmoke" Padding="20,0,20,0" />
+                    
                     <Label Grid.Column="1" x:Name="URL" Content="" VerticalContentAlignment="Center" Foreground="WhiteSmoke" />
 
                     <DockPanel x:Name="TaskTracking" Grid.Column="2" Margin="0,0,50,0">
@@ -1134,44 +1037,45 @@
                                Content="(No Task Selected)" Foreground="WhiteSmoke" />
                     </DockPanel>
 
-                    <Button Grid.Column="3" x:Name="VideoRecordingButton" BorderThickness="0" Background="Transparent"
-                            Click="VideoRecordingButton_Click">
-                        <Image x:Name="VideoRecordingStatus"
-                               Source="pack://application:,,,/Resources/videorecording.png"
-                               Height="24" Margin="2" />
-                    </Button>
-                    <Button Grid.Column="4" x:Name="RecordingNotesButton" BorderThickness="0" Background="Transparent"
-                            Click="RecordingNotesButton_Click" Visibility="Hidden">
-                        <Image x:Name="RecordingNotesStatus" Source="pack://application:,,,/Resources/speechbubble.png"
-                               Height="24" Margin="2" />
-                    </Button>
-                    <Button Grid.Column="5" x:Name="AudioRecordingButton" BorderThickness="0" Background="Transparent"
-                            Click="AudioRecordingButton_Click" Visibility="Hidden">
-                        <Image x:Name="AudioRecordingStatus"
-                               Source="pack://application:,,,/Resources/audiorecording.png"
-                               Height="24" Margin="2" />
-                    </Button>
-                    <Button Grid.Column="6" x:Name="SecondaryWindowButton" BorderThickness="0" Background="Transparent"
-                            Click="SecondaryWindow_Click" Visibility="Visible">
-                        <Image x:Name="SecondaryWindowStatus" Source="pack://application:,,,/Resources/target.png"
-                               Height="24" Margin="2" />
-                    </Button>
-                    <Button Grid.Column="7" x:Name="ConsoleButton" BorderThickness="0" Background="Transparent"
+                    <!-- <Button Grid.Column="3" x:Name="VideoRecordingButton" BorderThickness="0" Background="Transparent" -->
+                    <!--         Click="VideoRecordingButton_Click"> -->
+                    <!--     <Image x:Name="VideoRecordingStatus" -->
+                    <!--            Source="pack://application:,,,/Resources/videorecording.png" -->
+                    <!--            Height="24" Margin="2" /> -->
+                    <!-- </Button> -->
+                    <!-- -->
+                    <!-- <Button Grid.Column="4" x:Name="RecordingNotesButton" BorderThickness="0" Background="Transparent" -->
+                    <!--         Click="RecordingNotesButton_Click" Visibility="Hidden"> -->
+                    <!--     <Image x:Name="RecordingNotesStatus" Source="pack://application:,,,/Resources/speechbubble.png" -->
+                    <!--            Height="24" Margin="2" /> -->
+                    <!-- </Button> -->
+                    <!-- -->
+                    <!-- <Button Grid.Column="5" x:Name="AudioRecordingButton" BorderThickness="0" Background="Transparent" -->
+                    <!--         Click="AudioRecordingButton_Click" Visibility="Hidden"> -->
+                    <!--     <Image x:Name="AudioRecordingStatus" -->
+                    <!--            Source="pack://application:,,,/Resources/audiorecording.png" -->
+                    <!--            Height="24" Margin="2" /> -->
+                    <!-- </Button> -->
+
+                    <Button Grid.Column="3" x:Name="ConsoleButton" BorderThickness="0" Background="Transparent"
                             Click="Console_Click" Visibility="Visible">
                         <Image x:Name="ConsoleStatus" Source="pack://application:,,,/Resources/view.png" Height="24"
                                Margin="2" />
                     </Button>
                     
                     <Image x:Name="BackgroundUploadStatus"
+                           Grid.Column="4"
                            Source="pack://application:,,,/Resources/upload.png"
                            Height="24" Margin="2"
                            Visibility="Hidden"/>
                     
-                    <Label Grid.Column="9" x:Name="UserID" Content="" HorizontalContentAlignment="Center"
-                           VerticalContentAlignment="Center" Foreground="WhiteSmoke" />
-                    <Label Grid.Column="10" x:Name="PasswordExpiryNotice" Content="" HorizontalContentAlignment="Center"
+                    <Label Grid.Column="5" x:Name="UserID" Content="" HorizontalContentAlignment="Center"
+                           VerticalContentAlignment="Center" Foreground="WhiteSmoke" Margin="5,0,5,0" />
+                    
+                    <Label Grid.Column="6" x:Name="PasswordExpiryNotice" Content="" HorizontalContentAlignment="Center"
                            VerticalContentAlignment="Center" Background="Firebrick" Foreground="Yellow"
-                           Visibility="Collapsed" />
+                           Visibility="Collapsed" Margin="5,0,5,0" />
+                    
                 </Grid>
 
         </Border>