diff --git a/EssentialMAUIUIKit/EssentialMAUIUIKit/ViewModel/RestaurantDashboardViewModel.cs b/EssentialMAUIUIKit/EssentialMAUIUIKit/ViewModel/RestaurantDashboardViewModel.cs
index bf4e8a2..934b54e 100644
--- a/EssentialMAUIUIKit/EssentialMAUIUIKit/ViewModel/RestaurantDashboardViewModel.cs
+++ b/EssentialMAUIUIKit/EssentialMAUIUIKit/ViewModel/RestaurantDashboardViewModel.cs
@@ -163,12 +163,6 @@ public ObservableCollection<string> OrderDetailsHeader
 
         #region methods
 
-        private void OnDetailsClicked()
-        {
-            // Action on click
-            
-        }
-
         private void UpdateOrderDetails()
         {
             this.orderDetails = new ObservableCollection<RestaurantOrder>
diff --git a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/CompanyHistoryPage.xaml b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/CompanyHistoryPage.xaml
index 7b534f2..5a945b8 100644
--- a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/CompanyHistoryPage.xaml
+++ b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/CompanyHistoryPage.xaml
@@ -3,13 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="EssentialMAUIUIKit.Views.Dashboard.CompanyHistoryPage"
              xmlns:syncfusion="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
+             x:DataType="local:CompanyHistoryViewModel"
              xmlns:local="clr-namespace:EssentialMAUIUIKit">
     <ContentView.BindingContext>
         <local:CompanyHistoryViewModel/>
     </ContentView.BindingContext>
     <ContentView.Resources>
         <local:EvenOddConverter x:Key="EvenOddConverter" />
-        <Style x:Key="BorderStyleLeft" TargetType="Border">
+        <Style x:Key="BorderStyleLeft" x:DataType="local:CompanyHistoryData" TargetType="Border">
             <Style.Triggers>
                 <!-- Check if Index is odd (false) -->
                 <DataTrigger TargetType="Border" Binding="{Binding Index, Converter={StaticResource EvenOddConverter}}" Value="false">
@@ -17,7 +18,7 @@
                 </DataTrigger>
             </Style.Triggers>
         </Style>
-        <Style x:Key="LineStyleLeft" TargetType="Border">
+        <Style x:Key="LineStyleLeft" x:DataType="local:CompanyHistoryData" TargetType="Border">
             <Style.Triggers>
                 <!-- Check if Index is odd (false) -->
                 <DataTrigger TargetType="Border" Binding="{Binding Index, Converter={StaticResource EvenOddConverter}}" Value="false">
@@ -29,7 +30,7 @@
                 </DataTrigger>
             </Style.Triggers>
         </Style>
-        <Style x:Key="BorderStyleRight" TargetType="Border">
+        <Style x:Key="BorderStyleRight" x:DataType="local:CompanyHistoryData" TargetType="Border">
             <Style.Triggers>
                 <!-- Check if Index is odd (false) -->
                 <DataTrigger TargetType="Border" Binding="{Binding Index, Converter={StaticResource EvenOddConverter}}" Value="true">
@@ -37,7 +38,7 @@
                 </DataTrigger>
             </Style.Triggers>            
         </Style>
-        <Style x:Key="LineStyleRight" TargetType="Border">
+        <Style x:Key="LineStyleRight" x:DataType="local:CompanyHistoryData" TargetType="Border">
             <Style.Triggers>
                 <!-- Check if Index is odd (false) -->
                 <DataTrigger TargetType="Border" Binding="{Binding Index, Converter={StaticResource EvenOddConverter}}" Value="true">
@@ -72,18 +73,18 @@
             <syncfusion:SfAvatarView ContentType="Custom" AvatarSize="Medium" AvatarShape="Circle" ImageSource="{Binding ProfileImage}" HorizontalOptions="End" Background="White" Margin="0,0,24,0" IsVisible="{OnPlatform Android=False, iOS=False}"/>
         </Grid>
         <BoxView HeightRequest="1" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Fill" />
-        <Grid RowDefinitions="*" VerticalOptions="FillAndExpand" ColumnDefinitions="*" HorizontalOptions="FillAndExpand" Margin="{OnPlatform Android='0,10,10,0', iOS='0,10,10,0'}">
+        <Grid RowDefinitions="*" VerticalOptions="{OnPlatform Default=FillAndExpand}" ColumnDefinitions="*" HorizontalOptions="Fill" Margin="{OnPlatform Android='0,10,10,0', iOS='0,10,10,0'}">
             <ScrollView Grid.Row="0">
-                <Grid ColumnDefinitions="{OnPlatform WinUI='Auto,Auto,*', MacCatalyst='Auto,Auto,3*'}" RowDefinitions="*" VerticalOptions="FillAndExpand" Background="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
+                <Grid ColumnDefinitions="{OnPlatform WinUI='Auto,Auto,*', MacCatalyst='Auto,Auto,3*'}" RowDefinitions="*" VerticalOptions="Fill" Background="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
                     <!-- First Layout with Width 257 and Height 769 -->
-                    <Grid Grid.Column="0" VerticalOptions="StartAndExpand" HorizontalOptions="Start" IsVisible="{OnPlatform Android=False, iOS=False}" WidthRequest="{OnPlatform MacCatalyst=350}" Background="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
+                    <Grid Grid.Column="0" VerticalOptions="Start" HorizontalOptions="Start" IsVisible="{OnPlatform Android=False, iOS=False}" WidthRequest="{OnPlatform MacCatalyst=350}" Background="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
                         <VerticalStackLayout>
                             <CollectionView ItemsSource="{Binding MenuItemList}">
                                 <CollectionView.ItemTemplate>
                                     <DataTemplate>
                                         <Border Padding="10" Stroke="Transparent">
                                             <!-- Menu Item Text -->
-                                            <Label Text="{Binding Name}" FontSize="16" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" VerticalOptions="Center" Margin="0,0,5,0">
+                                            <Label x:DataType="local:CompanyHistoryMenuItem"  Text="{Binding Name}" FontSize="16" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" VerticalOptions="Center" Margin="0,0,5,0">
                                                 <Label.Triggers>
                                                     <DataTrigger TargetType="Label" Binding="{Binding IsSelected}" Value="True">
                                                         <Setter Property="TextColor" Value="{StaticResource PrimaryFormsColor}" />
@@ -96,7 +97,7 @@
                             </CollectionView>
                         </VerticalStackLayout>
                     </Grid>
-                    <BoxView Grid.Column="{OnPlatform WinUI='1',MacCatalyst='1'}"  WidthRequest="1" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Start" VerticalOptions="FillAndExpand" IsVisible="{OnPlatform Android=False, iOS=False}"/>
+                    <BoxView Grid.Column="{OnPlatform WinUI='1',MacCatalyst='1'}"  WidthRequest="1" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Start" VerticalOptions="Fill" IsVisible="{OnPlatform Android=False, iOS=False}"/>
                     <Grid Grid.Column="{OnPlatform WinUI='2',MacCatalyst='2'}" Grid.Row="{OnPlatform Android='0', iOS='0'}" VerticalOptions="{OnPlatform WinUI=FillAndExpand, MacCatalyst=Fill, Android=Start,iOS=Start}">
 
                         <Grid Grid.Row="0" RowDefinitions="Auto,*, *, *" VerticalOptions="Start" Background="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
@@ -105,8 +106,8 @@
                                     <Label Text="{Binding PageTitle}" FontSize="{OnPlatform WinUI='22', MacCatalyst='22',Android='16', iOS='16'}" FontFamily="{OnPlatform WinUI='Roboto-Regular', Android='Roboto-Medium', iOS='Roboto-Medium'}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" VerticalOptions="Start"/>
                                 </HorizontalStackLayout>
                             </Grid>
-                            <BoxView Grid.Row="1" HeightRequest="1" HorizontalOptions="FillAndExpand" Margin="0,0,0,0" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" VerticalOptions="Start" IsVisible="{OnPlatform Android=False,iOS=False}"/>
-                            <Grid Grid.Row="2" HeightRequest="{OnPlatform WinUI=60,MacCatalyst=60}" VerticalOptions="Start" HorizontalOptions="StartAndExpand" Margin="{OnPlatform WinUI='16,32,16,0',MacCatalyst='16,32,16,0', Android='16,16,16,16', iOS='16,16,16,16'}">
+                            <BoxView Grid.Row="1" HeightRequest="1" HorizontalOptions="Fill" Margin="0,0,0,0" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" VerticalOptions="Start" IsVisible="{OnPlatform Android=False,iOS=False}"/>
+                            <Grid Grid.Row="2" HeightRequest="{OnPlatform WinUI=60,MacCatalyst=60}" VerticalOptions="Start" HorizontalOptions="Start" Margin="{OnPlatform WinUI='16,32,16,0',MacCatalyst='16,32,16,0', Android='16,16,16,16', iOS='16,16,16,16'}">
                                 <Label  Text="{Binding PageDescription}" TextColor="{AppThemeBinding Light={DynamicResource ContentTextColorLight}, Dark={DynamicResource ContentTextColorDark}}"  FontFamily="Roboto-Regular" FontSize="16" />
                             </Grid>
                             <Grid Grid.Row="3" VerticalOptions="Fill" HorizontalOptions="Fill">
@@ -118,38 +119,37 @@
                                                 <Grid ColumnDefinitions="{OnPlatform WinUI='Auto,Auto,Auto',MacCatalyst='Auto,Auto,Auto'}" HorizontalOptions="Center" VerticalOptions="Fill" Margin="{OnPlatform Android='8,0,8,0', iOS='8,0,8,0'}">
                                                     <!-- Left Border -->
                                                     <Grid Grid.Column="{OnPlatform WinUI=0, MacCatalyst=0}" HorizontalOptions="Start" WidthRequest="{OnPlatform WinUI='324',MacCatalyst='324'}" HeightRequest="136" Margin="{OnPlatform Default='16,0,0,0',iOS='0,0,0,0'}" Background="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
-                                                        <Border Style="{StaticResource BorderStyleLeft}" VerticalOptions="CenterAndExpand" HorizontalOptions="FillAndExpand" Background="#7633DA" HeightRequest="2" WidthRequest="{OnPlatform Android='280', iOS='280'}" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="0,0,-2,0" IsVisible="False"/>
-                                                        <Border Style="{StaticResource BorderStyleLeft}" VerticalOptions="CenterAndExpand" HorizontalOptions="EndAndExpand" Background="#7633DA" HeightRequest="{OnPlatform Android=136, iOS=136}" WidthRequest="{OnPlatform Android='2', iOS='2'}" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="0,134,43,0" IsVisible="False"/>
-                                                        <Border Style="{StaticResource LineStyleLeft}" VerticalOptions="FillAndExpand" HorizontalOptions="StartAndExpand" Background="#7633DA" HeightRequest="{OnPlatform Android=136, iOS=136}" WidthRequest="{OnPlatform Android='2', iOS='2'}" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="32,-40,0,0" IsVisible="False"/>
-                                                        
-                                                        <Border Style="{StaticResource BorderStyleLeft}" Stroke="#7633DA" VerticalOptions="FillAndExpand" StrokeThickness="2" Margin="0,0,100,0" Padding="10" Background="#7633DA" IsVisible="False">
+                                                        <Border Style="{StaticResource BorderStyleLeft}" VerticalOptions="Center" HorizontalOptions="Fill" Background="#7633DA" HeightRequest="2" WidthRequest="{OnPlatform Android='280', iOS='280'}" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="0,0,-2,0" IsVisible="False"/>
+                                                        <Border Style="{StaticResource BorderStyleLeft}" VerticalOptions="Center" HorizontalOptions="End" Background="#7633DA" HeightRequest="{OnPlatform Android=136, iOS=136}" WidthRequest="{OnPlatform Android='2', iOS='2'}" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="0,134,43,0" IsVisible="False"/>
+                                                        <Border Style="{StaticResource LineStyleLeft}" VerticalOptions="Fill" HorizontalOptions="Start" Background="#7633DA" HeightRequest="{OnPlatform Android=136, iOS=136}" WidthRequest="{OnPlatform Android='2', iOS='2'}" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="32,-40,0,0" IsVisible="False"/>
+                                                        <Border Style="{StaticResource BorderStyleLeft}" Stroke="#7633DA" VerticalOptions="Fill" StrokeThickness="2" Margin="0,0,100,0" Padding="10" Background="#7633DA" IsVisible="False">
                                                             <VerticalStackLayout>
-                                                                <Label Text="{Binding Year}" TextColor="#FFFFFF" FontFamily="{OnPlatform WinUI='Roboto-Thin', MacCatalyst='Roboto-Thin', Android='Roboto-Regular', iOS='Roboto-Regular'}" FontAttributes="Bold" FontSize="16" />
-                                                                <Label Text="{Binding Achievements}" TextColor="#FFFFFF" FontFamily="{OnPlatform WinUI='Roboto-Thin', MacCatalyst='Roboto-Thin', Android='Roboto-Regular', iOS='Roboto-Regular'}" Margin="0,8,0,0" />
+                                                                <Label x:DataType="local:CompanyHistoryData" Text="{Binding Year}" TextColor="#FFFFFF" FontFamily="{OnPlatform WinUI='Roboto-Thin', MacCatalyst='Roboto-Thin', Android='Roboto-Regular', iOS='Roboto-Regular'}" FontAttributes="Bold" FontSize="16" />
+                                                                <Label x:DataType="local:CompanyHistoryData" Text="{Binding Achievements}" TextColor="#FFFFFF" FontFamily="{OnPlatform WinUI='Roboto-Thin', MacCatalyst='Roboto-Thin', Android='Roboto-Regular', iOS='Roboto-Regular'}" Margin="0,8,0,0" />
                                                             </VerticalStackLayout>  
                                                         </Border>
                                                     </Grid>
 
                                                     <!-- Middle Vertical Line -->
-                                                    <Grid Grid.Column="{OnPlatform WinUI='1', MacCatalyst='1'}" WidthRequest="14" VerticalOptions="FillAndExpand" IsVisible="{OnPlatform Android=False, iOS=False}">
-                                                        <Border VerticalOptions="FillAndExpand"   WidthRequest="14" HeightRequest="14" Stroke="#7633DA" BackgroundColor="#7633DA" HorizontalOptions="Center">
+                                                    <Grid Grid.Column="{OnPlatform WinUI='1', MacCatalyst='1'}" WidthRequest="14" VerticalOptions="Fill" IsVisible="{OnPlatform Android=False, iOS=False}">
+                                                        <Border VerticalOptions="Fill"   WidthRequest="14" HeightRequest="14" Stroke="#7633DA" BackgroundColor="#7633DA" HorizontalOptions="Center">
                                                             <Border.StrokeShape>
                                                                 <RoundRectangle CornerRadius="50" />
                                                             </Border.StrokeShape>                                                            
                                                         </Border>
-                                                        <Border VerticalOptions="FillAndExpand" HorizontalOptions="Center" WidthRequest="2" BackgroundColor="#7633DA" Stroke="#7633DA" />
+                                                        <Border VerticalOptions="Fill" HorizontalOptions="Center" WidthRequest="2" BackgroundColor="#7633DA" Stroke="#7633DA" />
                                                     </Grid>
 
                                                     <!-- Right Border -->
                                                     <Grid Grid.Column="{OnPlatform WinUI='2', MacCatalyst='2'}" WidthRequest="{OnPlatform WinUI='324',MacCatalyst='324'}" HeightRequest="136" Margin="0,16,0,16">
-                                                        <Border Style="{StaticResource LineStyleRight}" Background="#7633DA" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" HeightRequest="2" WidthRequest="{OnPlatform Android='280', iOS='280'}" BackgroundColor="Transparent" Stroke="Transparent" Margin="{OnPlatform Default='-6,0,0,0',iOS='-16,0,0,0'}" IsVisible="False"/>
-                                                        <Border Style="{StaticResource BorderStyleRight}" VerticalOptions="CenterAndExpand" HorizontalOptions="EndAndExpand" Background="#7633DA" HeightRequest="{OnPlatform Android=136, iOS=136}" WidthRequest="{OnPlatform Android='2'}" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="0,-43,43,0" IsVisible="False"/>
-                                                        <Border Style="{StaticResource LineStyleRight}" VerticalOptions="Center" HorizontalOptions="StartAndExpand" Background="#7633DA" HeightRequest="{OnPlatform Android=136, iOS=136}" WidthRequest="{OnPlatform Android='2'}" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="{OnPlatform Default='48,135,0,0', iOS='32,135,0,0'}" IsVisible="False"/>
+                                                        <Border Style="{StaticResource LineStyleRight}" Background="#7633DA" VerticalOptions="Fill" HorizontalOptions="Fill" HeightRequest="2" WidthRequest="{OnPlatform Android='280', iOS='280'}" BackgroundColor="Transparent" Stroke="Transparent" Margin="{OnPlatform Default='-6,0,0,0',iOS='-16,0,0,0'}" IsVisible="False"/>
+                                                        <Border Style="{StaticResource BorderStyleRight}" VerticalOptions="Center" HorizontalOptions="End" Background="#7633DA" HeightRequest="{OnPlatform Android=136, iOS=136}" WidthRequest="{OnPlatform Android='2'}" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="0,-43,43,0" IsVisible="False"/>
+                                                        <Border Style="{StaticResource LineStyleRight}" VerticalOptions="Center" HorizontalOptions="Start" Background="#7633DA" HeightRequest="{OnPlatform Android=136, iOS=136}" WidthRequest="{OnPlatform Android='2'}" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="{OnPlatform Default='48,135,0,0', iOS='32,135,0,0'}" IsVisible="False"/>
 
                                                         <Border Style="{StaticResource BorderStyleRight}" Background="{AppThemeBinding Dark={DynamicResource ReceivedMessageColorDark}, Light={DynamicResource ReceivedMessageColorLight}}" Stroke="Transparent" StrokeThickness="0" Margin="100,0,0,0" Padding="10" IsVisible="False">
                                                             <VerticalStackLayout>
-                                                                <Label Text="{Binding Year}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" FontFamily="{OnPlatform WinUI='Roboto-Thin', MacCatalyst='Roboto-Thin', Android='Roboto-Regular', iOS='Roboto-Regular'}" FontAttributes="Bold" FontSize="16" />
-                                                                <Label Text="{Binding Achievements}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" FontFamily="{OnPlatform WinUI='Roboto-Thin', MacCatalyst='Roboto-Thin', Android='Roboto-Regular', iOS='Roboto-Regular'}" FontSize="14" Margin="0,8,0,0" />
+                                                                <Label x:DataType="local:CompanyHistoryData"  Text="{Binding Year}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" FontFamily="{OnPlatform WinUI='Roboto-Thin', MacCatalyst='Roboto-Thin', Android='Roboto-Regular', iOS='Roboto-Regular'}" FontAttributes="Bold" FontSize="16" />
+                                                                <Label x:DataType="local:CompanyHistoryData" Text="{Binding Achievements}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" FontFamily="{OnPlatform WinUI='Roboto-Thin', MacCatalyst='Roboto-Thin', Android='Roboto-Regular', iOS='Roboto-Regular'}" FontSize="14" Margin="0,8,0,0" />
                                                             </VerticalStackLayout>                                                           
                                                         </Border>
                                                     </Grid>
diff --git a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/DailyCaloriesReportPage.xaml b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/DailyCaloriesReportPage.xaml
index 858553a..ddfd275 100644
--- a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/DailyCaloriesReportPage.xaml
+++ b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/DailyCaloriesReportPage.xaml
@@ -10,11 +10,11 @@
         <local:DailyCaloriesReportViewModel/>
     </ContentView.BindingContext>
     <ContentView.Content>
-        <StackLayout>            
-            <Grid RowDefinitions="{OnPlatform WinUI='*'}" VerticalOptions="FillAndExpand" ColumnDefinitions="*" HorizontalOptions="FillAndExpand" Background="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
+        <StackLayout>
+            <Grid RowDefinitions="{OnPlatform WinUI='*'}" VerticalOptions="{OnPlatform Default=FillAndExpand}" ColumnDefinitions="*" HorizontalOptions="Fill" Background="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
                 <ScrollView Grid.Row="{OnPlatform WinUI='0'}">
                     <Grid Grid.Column="{OnPlatform WinUI='1'}" Grid.Row="{OnPlatform Android='0', iOS='0'}" VerticalOptions="{OnPlatform WinUI=FillAndExpand, Android=Start, iOS=Start}">
-                        <BoxView WidthRequest="2" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Start" VerticalOptions="FillAndExpand" />
+                        <BoxView WidthRequest="2" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Start" VerticalOptions="Fill" />
                          <Grid RowDefinitions="Auto,*" Margin="{OnPlatform WinUI='10,0,10,0'}" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
                             <Grid Grid.Row="0" RowDefinitions="Auto,*" VerticalOptions="{OnPlatform WinUI='Start', Android='Start',iOS='Start'}">
                                 <Grid Grid.Row="0" ColumnDefinitions="*,*"  HeightRequest="{OnPlatform WinUI=60}" Margin="0,16,16,0">                                   
@@ -28,7 +28,7 @@
                                             </Border.Shadow>
                                             <Grid Margin="{OnPlatform Android='20,0,0,0', iOS='20,0,0,0'}">
                                                 <!--DatePicker control-->
-                                                <DatePicker Date="{Binding Date, Mode=TwoWay}" HeightRequest="{OnPlatform WinUI=40, Android=60, iOS=60}" WidthRequest="145" FontSize="14" Format="dd MMM, yyyy" MinimumDate="2000-01-01" MaximumDate="2030-12-31" BackgroundColor="Transparent" VerticalOptions="CenterAndExpand" HorizontalOptions="{OnPlatform WinUI=End, Android=Center}" FontFamily="Roboto-Regular" Margin="15,0,0,0" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"/>
+                                                <DatePicker x:DataType="local:CaloriesConsumedData" Date="{Binding Date, Mode=TwoWay}" HeightRequest="{OnPlatform WinUI=40, Android=60, iOS=60}" WidthRequest="145" FontSize="14" Format="dd MMM, yyyy" MinimumDate="2000-01-01" MaximumDate="2030-12-31" BackgroundColor="Transparent" VerticalOptions="Center" HorizontalOptions="{OnPlatform WinUI=End, Android=Center}" FontFamily="Roboto-Regular" Margin="15,0,0,0" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"/>
                                                 <!--Datepicker Icon-->
                                                 <!--Datepicker Icon-->
                                                 <Label FontFamily="DashboardFontIcons" Text="&#xe711;" Grid.Row="0" VerticalOptions="Center" HorizontalOptions="End" Margin="{OnPlatform Android='0,0,25,0',iOS='0,0,25,0', WinUI='0,0,10,0'}" IsVisible="{OnPlatform WinUI=True}" HeightRequest="14" WidthRequest="12" Background = "{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}"/>
@@ -36,11 +36,11 @@
                                         </Border>
                                     </HorizontalStackLayout>
                                 </Grid>
-                                <Grid Grid.Row="1" VerticalOptions="FillAndExpand">
+                                <Grid Grid.Row="1" x:DataType="local:DailyCaloriesReportViewModel" VerticalOptions="Fill">
                                     <chart:SfCircularChart>
                                         <!-- Series Definition -->
                                         <chart:SfCircularChart.Series>
-                                            <chart:DoughnutSeries  x:Name="doughnutSeries" ItemsSource="{Binding CaloriesChartDataValue.CaloriesConsumedInADay}" XBindingPath="Nutrient" YBindingPath="Value" InnerRadius ="0.8" PaletteBrushes="{Binding CaloriesChartDataValue.SegmentColors}" ShowDataLabels="False" StrokeWidth="5"  
+                                            <chart:DoughnutSeries x:Name="doughnutSeries" ItemsSource="{Binding CaloriesChartDataValue.CaloriesConsumedInADay}" XBindingPath="Nutrient" YBindingPath="Value" InnerRadius ="0.8" PaletteBrushes="{Binding CaloriesChartDataValue.SegmentColors}" ShowDataLabels="False" StrokeWidth="5"  
                                                 Stroke="{AppThemeBinding Dark={DynamicResource BackgroundColorDark}, Light={DynamicResource BackgroundColorLight}}">
                                             </chart:DoughnutSeries>
                                         </chart:SfCircularChart.Series>
@@ -54,14 +54,14 @@
                             </Grid>
                             <Grid Grid.Row="1">
                                 <Grid Padding="0" RowDefinitions="Auto,Auto">
-                                    <CollectionView ItemsSource="{Binding CaloriesConsumedList}">
+                                    <CollectionView x:DataType="local:DailyCaloriesReportViewModel" ItemsSource="{Binding CaloriesConsumedList}">
                                         <CollectionView.ItemTemplate>
                                             <DataTemplate>
-                                                <StackLayout IsVisible ="{Binding IsSelected}" HorizontalOptions="Fill">
-                                                    <syncfusion:SfChipGroup ItemsSource="{Binding CaloriesConsumedPerMeal}" SelectedItem="{Binding CaloriesConsumedPerMeal[0],Mode=OneTime}" SelectionChanged="OnChipSelectionChanging"  ChipType="Choice" ChipCornerRadius="25" Margin="16,0,0,0" ChipStroke="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}"  ChipFontFamily="Roboto-Medium" ImageMemberPath="{Binding MealOptions}" ChipTextColor="{AppThemeBinding Light={DynamicResource BackgroundColorDark}, Dark={DynamicResource BackgroundColorLight}}" SelectedChipBackground="{DynamicResource PrimaryColorLight}" SelectedChipTextColor="{DynamicResource BackgroundColorLight}" >
+                                                <StackLayout x:DataType="local:CaloriesConsumedData" IsVisible ="{Binding IsSelected}" HorizontalOptions="Fill">
+                                                    <syncfusion:SfChipGroup ItemsSource="{Binding CaloriesConsumedPerMeal}" SelectedItem="{Binding CaloriesConsumedPerMeal[0],Mode=OneTime}" SelectionChanged="OnChipSelectionChanging"  ChipType="Choice" ChipCornerRadius="25" Margin="16,0,0,0" ChipStroke="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" ChipFontFamily="Roboto-Medium" ChipTextColor="{AppThemeBinding Light={DynamicResource BackgroundColorDark}, Dark={DynamicResource BackgroundColorLight}}" SelectedChipBackground="{DynamicResource PrimaryColorLight}" SelectedChipTextColor="{DynamicResource BackgroundColorLight}" >
                                                         <syncfusion:SfChipGroup.ItemTemplate>
                                                             <DataTemplate>
-                                                                <Grid HeightRequest="32">
+                                                                <Grid x:DataType="local:MealCalorieConsumed" HeightRequest="32">
                                                                     <Grid.ColumnDefinitions>
                                                                         <ColumnDefinition Width="Auto" />
                                                                         <ColumnDefinition Width="Auto" />
@@ -78,10 +78,10 @@
                                         </CollectionView.ItemTemplate>
 
                                     </CollectionView>
-                                    <CollectionView ItemsSource="{Binding CaloriesChartDataValue.SelectedMealDetails, Mode=TwoWay}" SelectionMode="None" Grid.Row="1">
+                                    <CollectionView x:DataType="local:DailyCaloriesReportViewModel" ItemsSource="{Binding CaloriesChartDataValue.SelectedMealDetails, Mode=TwoWay}" SelectionMode="None" Grid.Row="1">
                                         <CollectionView.ItemTemplate>
                                             <DataTemplate>
-                                                <Grid RowSpacing="16" HorizontalOptions="FillAndExpand" Margin="16,0,16,0" MaximumWidthRequest="383" HeightRequest="206" Padding="10">
+                                                <Grid x:DataType="local:MealCalorieConsumed"  RowSpacing="16" HorizontalOptions="Fill" Margin="16,0,16,0" MaximumWidthRequest="383" HeightRequest="206" Padding="10">
                                                     <Grid.RowDefinitions>
                                                         <RowDefinition Height="*"/>
                                                         <RowDefinition Height="*"/>
@@ -92,7 +92,7 @@
                                                         <ColumnDefinition Width="*"/>
                                                     </Grid.ColumnDefinitions>
                                                     <!--Nutritional Data Boxes-->
-                                                    <Border Grid.Row="0" Grid.Column="0" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="FillAndExpand" Margin="0,0,5,0">
+                                                    <Border Grid.Row="0" Grid.Column="0" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="Fill" Margin="0,0,5,0">
                                                         <Border.Shadow>
                                                             <!--Combined Shadow Effect-->
                                                             <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
@@ -105,7 +105,7 @@
 
                                                     </Border>
 
-                                                    <Border Grid.Row="0" Grid.Column="1" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"   HorizontalOptions="FillAndExpand" Margin="5,0,5,0">
+                                                    <Border Grid.Row="0" Grid.Column="1" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"   HorizontalOptions="Fill" Margin="5,0,5,0">
                                                         <Border.Shadow>
                                                             <!--Combined Shadow Effect-->
                                                             <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
@@ -117,7 +117,7 @@
                                                         </StackLayout>
                                                     </Border>
 
-                                                    <Border Grid.Row="0" Grid.Column="2" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}" HorizontalOptions="FillAndExpand" Margin="5,0,0,0" >
+                                                    <Border Grid.Row="0" Grid.Column="2" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}" HorizontalOptions="Fill" Margin="5,0,0,0" >
                                                         <Border.Shadow>
                                                             <!--Combined Shadow Effect-->
                                                             <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
@@ -129,7 +129,7 @@
                                                         </StackLayout>
                                                     </Border>
 
-                                                    <Border Grid.Row="1" Grid.Column="0" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="FillAndExpand" Margin="0,0,5,0">
+                                                    <Border Grid.Row="1" Grid.Column="0" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="Fill" Margin="0,0,5,0">
                                                         <Border.Shadow>
                                                             <!--Combined Shadow Effect-->
                                                             <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
@@ -141,7 +141,7 @@
                                                         </StackLayout>
                                                     </Border>
 
-                                                    <Border Grid.Row="1" Grid.Column="1" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="FillAndExpand" Margin="5,0,5,0">
+                                                    <Border Grid.Row="1" Grid.Column="1" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="Fill" Margin="5,0,5,0">
                                                         <Border.Shadow>
                                                             <!--Combined Shadow Effect-->
                                                             <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
@@ -153,7 +153,7 @@
                                                         </StackLayout>
                                                     </Border>
 
-                                                    <Border Grid.Row="1" Grid.Column="2" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="FillAndExpand" Margin="5,0,0,0">
+                                                    <Border Grid.Row="1" Grid.Column="2" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="Fill" Margin="5,0,0,0">
                                                         <Border.Shadow>
                                                             <!--Combined Shadow Effect-->
                                                             <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
diff --git a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/DailyTimelinePage.xaml b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/DailyTimelinePage.xaml
index c2b7589..ba7af2d 100644
--- a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/DailyTimelinePage.xaml
+++ b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/DailyTimelinePage.xaml
@@ -8,13 +8,13 @@
     </ContentView.BindingContext>
     <StackLayout >
 
-        <Border StrokeThickness="1" Stroke="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" VerticalOptions="FillAndExpand" WidthRequest="{OnPlatform WinUI=647, MacCatalyst=647}" HorizontalOptions="CenterAndExpand" Margin="{OnPlatform WinUI='0,32,0,32'}">
+        <Border StrokeThickness="1" Stroke="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" VerticalOptions="{OnPlatform Default=FillAndExpand}"  WidthRequest="{OnPlatform WinUI=647, MacCatalyst=647}" HorizontalOptions="Center" Margin="{OnPlatform WinUI='0,32,0,32'}">
             <Border.StrokeShape>
                 <RoundRectangle CornerRadius="8"/>
             </Border.StrokeShape>
             <Grid RowDefinitions="Auto,Auto,*">
                 <Grid Grid.Row="0" HeightRequest="80">
-                    <Border Stroke="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}"  HeightRequest="40" WidthRequest="{OnPlatform WinUI=145, MacCatalyst=145}"  BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}" HorizontalOptions="Start" Margin="16,0,0,0">
+                    <Border Stroke="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}" HeightRequest="40" WidthRequest="{OnPlatform WinUI=145, MacCatalyst=145}"  BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}" HorizontalOptions="Start" Margin="16,0,0,0">
                         <Border.StrokeShape>
                             <RoundRectangle CornerRadius="20"/>
                         </Border.StrokeShape>
@@ -23,40 +23,40 @@
                         </Border.Shadow>
                         <Grid Margin="{OnPlatform Android='20,0,0,0', iOS='20,0,0,0'}">                            
                              <!--DatePicker control--> 
-                            <DatePicker Date="{Binding SelectedDate, Mode=TwoWay}" HeightRequest="60" WidthRequest="145" FontSize="14" Format="dd MMM, yyyy" MinimumDate="2000-01-01" MaximumDate="2030-12-31" BackgroundColor="Transparent" VerticalOptions="CenterAndExpand" HorizontalOptions="{OnPlatform WinUI=End, MacCatalyst=End, Android=Center, iOS=Center}" FontFamily="Roboto-Medium" Margin="{OnPlatform Default='10,0,0,0', MacCatalyst='10,40,0,0'}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"/>
+                            <DatePicker x:DataType="local:DailyTimelineViewModel" Date="{Binding SelectedDate, Mode=TwoWay}" HeightRequest="60" WidthRequest="145" FontSize="14" Format="dd MMM, yyyy" MinimumDate="2000-01-01" MaximumDate="2030-12-31" BackgroundColor="Transparent" VerticalOptions="Center" HorizontalOptions="{OnPlatform WinUI=End, MacCatalyst=End, Android=Center, iOS=Center}" FontFamily="Roboto-Medium" Margin="{OnPlatform Default='10,0,0,0', MacCatalyst='10,40,0,0'}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"/>
                             <!--Datepicker Icon-->
                             <Label FontFamily="DashboardFontIcons" Text="&#xe711;" Grid.Row="0" VerticalOptions="Center" HorizontalOptions="End" Margin="{OnPlatform Android='0,0,25,0', iOS='0,0,25,0', WinUI='0,0,10,0', MacCatalyst='0,0,10,0'}" IsVisible="{OnPlatform WinUI=True}" HeightRequest="14" WidthRequest="12" Background = "{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}" />
                         </Grid>
                     </Border>
                 </Grid>
-                <BoxView Grid.Row="1" HeightRequest="1" HorizontalOptions="FillAndExpand" Margin="16,0,16,0" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" />
-                <Grid Grid.Row="2" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" Margin="16,16,0,16">
-                    <CollectionView HorizontalOptions="FillAndExpand" ItemsSource="{Binding DailyActivities}" SelectionMode="None">
+                <BoxView Grid.Row="1" HeightRequest="1" HorizontalOptions="Fill" Margin="16,0,16,0" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" />
+                <Grid Grid.Row="2" VerticalOptions="Fill" HorizontalOptions="Fill" Margin="16,16,0,16">
+                    <CollectionView HorizontalOptions="Fill" x:DataType="local:DailyTimelineViewModel" ItemsSource="{Binding DailyActivities}" SelectionMode="None">
                         <CollectionView.ItemTemplate>
                             <DataTemplate>
                                 <VerticalStackLayout>
                                     <Grid ColumnDefinitions="Auto,Auto,Auto" >
                                         <Border Stroke="Transparent" WidthRequest="42" HeightRequest="32" VerticalOptions="Start">
-                                            <Label Text="{Binding Time}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"  Grid.Column="0" FontSize="14" FontFamily="{OnPlatform WinUI=Roboto-Thin,MacCatalyst=Roboto-Thin, Android=Roboto-Medium, iOS=Roboto-Medium}" VerticalOptions="Center"/>
+                                            <Label x:DataType="local:DailyActivity" Text="{Binding Time}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"  Grid.Column="0" FontSize="14" FontFamily="{OnPlatform WinUI=Roboto-Thin,MacCatalyst=Roboto-Thin, Android=Roboto-Medium, iOS=Roboto-Medium}" VerticalOptions="Center"/>
                                         </Border>
                                         <Grid Grid.Column="1" RowDefinitions="Auto,Auto">
                                             <Border Grid.Row="0" VerticalOptions="Start"   WidthRequest="32" HeightRequest="32" Stroke="Transparent" BackgroundColor="#7633DA" HorizontalOptions="Center">
                                                 <Border.StrokeShape>
                                                     <RoundRectangle CornerRadius="100" />
                                                 </Border.StrokeShape>
-                                                <Label FontFamily="DashboardFontIcons" Text="{Binding Icon}"  WidthRequest="16" HeightRequest="16" HorizontalOptions="Center" TextColor="{DynamicResource White}"/>                                               
+                                                <Label FontFamily="DashboardFontIcons" x:DataType="local:DailyActivity" Text="{Binding Icon}"  WidthRequest="16" HeightRequest="16" HorizontalOptions="Center" TextColor="{DynamicResource White}"/>                                               
                                             </Border>
                                             <Border Grid.Row="1" HeightRequest="52" WidthRequest="2" BackgroundColor="#7633DA" Stroke="#7633DA" Margin="0,2,0,2">
                                                 <Border.Triggers>
-                                                    <DataTrigger TargetType="Border" Binding="{Binding IsLastItem}" Value="True">
+                                                    <DataTrigger TargetType="Border" x:DataType="local:DailyActivity" Binding="{Binding IsLastItem}" Value="True">
                                                         <Setter Property="IsVisible" Value="False" />
                                                     </DataTrigger>
                                                 </Border.Triggers>
                                             </Border>
                                         </Grid>
                                         <Grid RowDefinitions="Auto,Auto" Grid.Column="2" WidthRequest="210" HeightRequest="80" Margin="10,0,0,0">
-                                            <Label Text="{Binding ActivityTitle}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HeightRequest="20"  Grid.Row="0" FontFamily="Roboto-Medium" FontAttributes="{OnPlatform Android='Bold', iOS='Bold'}" FontSize="14" VerticalOptions="Start" />
-                                            <Label Text="{Binding ActivityDescription}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HeightRequest="60" Grid.Row="1" FontFamily="{OnPlatform WinUI=Roboto-Thin, MacCatalyst=Roboto-Thin, Android=Roboto-Medium, iOS=Roboto-Medium}" FontSize="14" VerticalOptions="FillAndExpand" />
+                                            <Label x:DataType="local:DailyActivity" Text="{Binding ActivityTitle}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HeightRequest="20"  Grid.Row="0" FontFamily="Roboto-Medium" FontAttributes="{OnPlatform Android='Bold', iOS='Bold'}" FontSize="14" VerticalOptions="Start" />
+                                            <Label x:DataType="local:DailyActivity" Text="{Binding ActivityDescription}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HeightRequest="60" Grid.Row="1" FontFamily="{OnPlatform WinUI=Roboto-Thin, MacCatalyst=Roboto-Thin, Android=Roboto-Medium, iOS=Roboto-Medium}" FontSize="14" VerticalOptions="Fill" />
                                         </Grid>
                                     </Grid>
                                 </VerticalStackLayout>
diff --git a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/HealthCarePage.xaml b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/HealthCarePage.xaml
index 9d892be..fa54ea8 100644
--- a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/HealthCarePage.xaml
+++ b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/HealthCarePage.xaml
@@ -5,7 +5,7 @@
              xmlns:listView="clr-namespace:Syncfusion.Maui.ListView;assembly=Syncfusion.Maui.ListView"
              xmlns:controls="clr-namespace:EssentialMAUIUIKit.Controls"
              xmlns:chart="clr-namespace:Syncfusion.Maui.Charts;assembly=Syncfusion.Maui.Charts"
-             xmlns:local="clr-namespace:EssentialMAUIUIKit"             
+             xmlns:local="clr-namespace:EssentialMAUIUIKit"
              xmlns:syncfusion="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
              xmlns:segmentedControl="clr-namespace:Syncfusion.Maui.Toolkit.SegmentedControl;assembly=Syncfusion.Maui.Toolkit"
              xmlns:gauge="clr-namespace:Syncfusion.Maui.Gauges;assembly=Syncfusion.Maui.Gauges">
@@ -26,21 +26,21 @@
                 </syncfusion:SfBadgeView>
 
                 <!-- Profile Image Avatar -->
-                <syncfusion:SfAvatarView ContentType="Custom" AvatarSize="Medium" AvatarShape="Circle" ImageSource="{Binding ProfileImage}" HorizontalOptions="End" Background="White" Margin="0,0,24,0" IsVisible="{OnPlatform Android=False, iOS=False}"/>
+                <syncfusion:SfAvatarView ContentType="Custom" AvatarSize="Medium" AvatarShape="Circle" x:DataType="local:HealthCareViewModel" ImageSource="{Binding ProfileImage}" HorizontalOptions="End" Background="White" Margin="0,0,24,0" IsVisible="{OnPlatform Android=False, iOS=False}"/>
             </Grid>
             <BoxView HeightRequest="1" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Fill" />
-            <Grid RowDefinitions="{OnPlatform WinUI='*', MacCatalyst='*'}" VerticalOptions="FillAndExpand" ColumnDefinitions="*" HorizontalOptions="FillAndExpand" Background="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
+            <Grid RowDefinitions="{OnPlatform WinUI='*', MacCatalyst='*'}" VerticalOptions="{OnPlatform Default= 'FillAndExpand'}" ColumnDefinitions="*" HorizontalOptions="Fill" Background="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
                 <ScrollView Grid.Row="{OnPlatform WinUI='0', MacCatalyst='0'}">
-                    <Grid ColumnDefinitions="{OnPlatform WinUI='Auto, 5*, 3*', MacCatalyst='Auto, 4*, 2*'}" RowDefinitions="*" VerticalOptions="FillAndExpand">
+                    <Grid ColumnDefinitions="{OnPlatform WinUI='Auto, 5*, 3*', MacCatalyst='Auto, 4*, 2*'}" RowDefinitions="*" VerticalOptions="Fill">
                         <!-- First Layout with Width 257 and Height 769 -->
-                        <Grid Grid.Column="0" VerticalOptions="StartAndExpand" HorizontalOptions="Start" WidthRequest="{OnPlatform MacCatalyst=350}" IsVisible="{OnPlatform Android=False, iOS=False}">
+                        <Grid Grid.Column="0" VerticalOptions="Start" HorizontalOptions="Start" WidthRequest="{OnPlatform MacCatalyst=350}" IsVisible="{OnPlatform Android=False, iOS=False}">
                             <VerticalStackLayout>
-                                <CollectionView ItemsSource="{Binding MenuItemList}">
+                                <CollectionView x:DataType="local:HealthCareViewModel" ItemsSource="{Binding MenuItemList}">
                                     <CollectionView.ItemTemplate>
                                         <DataTemplate>
                                             <Border Padding="10" Stroke="Transparent">
                                                 <!-- Menu Item Text -->
-                                                <Label Text="{Binding Name}" FontSize="16" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" VerticalOptions="Center" Margin="0,0,5,0">
+                                                <Label x:DataType="local:HealthCareMenuItem" Text="{Binding Name}" FontSize="16" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" VerticalOptions="Center" Margin="0,0,5,0">
                                                     <Label.Triggers>
                                                         <DataTrigger TargetType="Label" Binding="{Binding IsSelected}" Value="True">
                                                             <Setter Property="TextColor" Value="{StaticResource PrimaryFormsColor}" />
@@ -55,7 +55,7 @@
                         </Grid>
                         <!-- Second Layout with Width 631 and Height 769 -->
                         <Grid Grid.Column="{OnPlatform WinUI='1', MacCatalyst='1'}" Grid.Row="{OnPlatform Android='0',iOS='0'}" VerticalOptions="{OnPlatform WinUI=FillAndExpand, MacCatalyst=FillAndExpand, Android=Start}" IsVisible="{OnPlatform Android=False, iOS=False}">
-                            <BoxView WidthRequest="2" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Start" VerticalOptions="FillAndExpand" />
+                            <BoxView WidthRequest="2" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Start" VerticalOptions="Fill" />
                             <Grid RowDefinitions="Auto,Auto,*" Margin="{OnPlatform WinUI='10,0,10,0', MacCatalyst='10,0,10,0'}" IsVisible="{OnPlatform Android=False, iOS=False}" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}">
                                 <Grid Grid.Row="0" RowDefinitions="Auto,*" VerticalOptions="Start">
                                     <Grid Grid.Row="0" ColumnDefinitions="*,*"  Margin="{OnPlatform WinUI='32,0,32,0', MacCatalyst='32,0,32,0', Android='16,0,16,0', iOS='16,0,16,0'}" HeightRequest="{OnPlatform WinUI=60, MacCatalyst=60}" IsVisible="{OnPlatform Android=False, iOS=False}">
@@ -72,14 +72,14 @@
                                                 </Border.Shadow>
                                                 <Grid Margin="{OnPlatform Android='20,0,0,0',iOS='20,0,0,0'}">
                                                     <!--DatePicker control-->
-                                                    <DatePicker Date="{Binding Date, Mode=TwoWay}" HeightRequest="{OnPlatform WinUI=40, MacCatalyst=40}" WidthRequest="145" FontSize="14" Format="dd MMM, yyyy" MinimumDate="2000-01-01" MaximumDate="2030-12-31" BackgroundColor="Transparent" VerticalOptions="CenterAndExpand" HorizontalOptions="{OnPlatform Default=End, Android=Center, iOS=Center}" FontFamily="Roboto-Regular" Margin="{OnPlatform Default='15,0,0,0',MacCatalyst='15,20,0,0'}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"/>
+                                                    <DatePicker x:DataType="local:CaloriesConsumedData"  Date="{Binding Date, Mode=TwoWay}" HeightRequest="{OnPlatform WinUI=40, MacCatalyst=40}" WidthRequest="145" FontSize="14" Format="dd MMM, yyyy" MinimumDate="2000-01-01" MaximumDate="2030-12-31" BackgroundColor="Transparent" VerticalOptions="Center" HorizontalOptions="{OnPlatform Default=End, Android=Center, iOS=Center}" FontFamily="Roboto-Regular" Margin="{OnPlatform Default='15,0,0,0',MacCatalyst='15,20,0,0'}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"/>
                                                     <!--Datepicker Icon-->
                                                     <Label FontFamily="DashboardFontIcons" Text="&#xe711;" Grid.Row="0" VerticalOptions="Center" HorizontalOptions="End" Margin="{OnPlatform Android='0,0,25,0', iOS='0,0,25,0', WinUI='0,0,10,0', MacCatalyst='0,0,10,0'}" IsVisible="{OnPlatform WinUI=True}" HeightRequest="14" WidthRequest="12" Background = "{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource GrayBorderBackgroundColor}}"/>
                                                 </Grid>
                                             </Border>
                                         </HorizontalStackLayout>
                                     </Grid>
-                                    <Grid Grid.Row="1" VerticalOptions="FillAndExpand">
+                                    <Grid x:DataType="local:HealthCareViewModel" Grid.Row="1" VerticalOptions="Fill">
                                         <chart:SfCircularChart>
                                             <!-- Series Definition -->
                                             <chart:SfCircularChart.Series>
@@ -100,14 +100,14 @@
                                 </Grid>
                                 <Grid Grid.Row="2">
                                     <Grid Padding="0" RowDefinitions="Auto,Auto">
-                                        <CollectionView ItemsSource="{Binding CaloriesConsumedList}">
+                                        <CollectionView x:DataType="local:HealthCareViewModel" ItemsSource="{Binding CaloriesConsumedList}">
                                             <CollectionView.ItemTemplate>
                                                 <DataTemplate>
-                                                    <StackLayout IsVisible ="{Binding IsSelected}">
-                                                        <syncfusion:SfChipGroup ItemsSource="{Binding CaloriesConsumedPerMeal}" SelectedItem="{Binding CaloriesConsumedPerMeal[0],Mode=OneTime}" SelectionChanged="OnChipSelectionChanging"  ChipType="Choice" ChipCornerRadius="25" Margin="16,16,0,0" ChipStroke="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}"  ChipFontFamily="Roboto-Medium" ImageMemberPath="{Binding MealOptions}" ChipTextColor="{AppThemeBinding Light={DynamicResource BackgroundColorDark}, Dark={DynamicResource BackgroundColorLight}}" SelectedChipBackground="{DynamicResource PrimaryColorLight}" SelectedChipTextColor="{DynamicResource BackgroundColorLight}" >
+                                                    <StackLayout x:DataType="local:CaloriesConsumedData" IsVisible ="{Binding IsSelected}">
+                                                        <syncfusion:SfChipGroup ItemsSource="{Binding CaloriesConsumedPerMeal}" SelectedItem="{Binding CaloriesConsumedPerMeal[0],Mode=OneTime}" SelectionChanged="OnChipSelectionChanging"  ChipType="Choice" ChipCornerRadius="25" Margin="16,16,0,0" ChipStroke="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}"  ChipFontFamily="Roboto-Medium" ChipTextColor="{AppThemeBinding Light={DynamicResource BackgroundColorDark}, Dark={DynamicResource BackgroundColorLight}}" SelectedChipBackground="{DynamicResource PrimaryColorLight}" SelectedChipTextColor="{DynamicResource BackgroundColorLight}" >
                                                             <syncfusion:SfChipGroup.ItemTemplate>
                                                                 <DataTemplate>
-                                                                    <Grid HeightRequest="32" >
+                                                                    <Grid x:DataType="local:MealCalorieConsumed" HeightRequest="32" >
                                                                         <Grid.ColumnDefinitions>
                                                                             <ColumnDefinition Width="Auto" />
                                                                             <ColumnDefinition Width="*" />
@@ -123,8 +123,8 @@
                                                 </DataTemplate>
                                             </CollectionView.ItemTemplate>
                                             
-                                        </CollectionView>                                        
-                                        <CollectionView ItemsSource="{Binding CaloriesChartDataValue.SelectedMealDetails, Mode=TwoWay}" Margin="{OnPlatform MacCatalyst='120,0,120,0'}" WidthRequest="{OnPlatform WinUI=383, Android=383}" HeightRequest="{OnPlatform MacCatalyst=420, Default=206}" SelectionMode="None" Grid.Row="1">
+                                        </CollectionView>
+                                        <CollectionView x:DataType="local:HealthCareViewModel" ItemsSource="{Binding CaloriesChartDataValue.SelectedMealDetails, Mode=TwoWay}" Margin="{OnPlatform MacCatalyst='120,0,120,0'}" WidthRequest="{OnPlatform WinUI=383, Android=383}" HeightRequest="{OnPlatform MacCatalyst=420, Default=206}" SelectionMode="None" Grid.Row="1">
                                             <CollectionView.ItemTemplate>
                                                 <DataTemplate>
                                                     <Grid RowSpacing="16" ColumnSpacing="16" HorizontalOptions="Fill" Margin="16,75,10,0"  Padding="10">
@@ -143,7 +143,7 @@
                                                                 <!--Combined Shadow Effect-->
                                                                 <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
                                                             </Border.Shadow>
-                                                            <StackLayout VerticalOptions="Center" HorizontalOptions="Center">
+                                                            <StackLayout x:DataType="local:MealCalorieConsumed" VerticalOptions="Center" HorizontalOptions="Center">
                                                                 <Label Text="{Binding CaloriesFromFiber}" FontSize="28" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HorizontalTextAlignment="Center"/>
                                                                 <Label Text="Fiber" FontSize="14" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Dark={DynamicResource SecondaryTextColorDark}, Light={DynamicResource SecondaryTextColorLight}}" HorizontalTextAlignment="Center"/>
                                                                 <BoxView Color="{Binding NutrientColorValue.FiberColor}" WidthRequest="52" HeightRequest="4" HorizontalOptions="Center" Margin="0,2,0,0" />
@@ -151,60 +151,60 @@
 
                                                         </Border>
 
-                                                        <Border Grid.Row="0" Grid.Column="1" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"   HorizontalOptions="FillAndExpand" Margin="5,0,5,0">
+                                                        <Border Grid.Row="0" Grid.Column="1" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"   HorizontalOptions="Fill" Margin="5,0,5,0">
                                                             <Border.Shadow>
                                                                 <!--Combined Shadow Effect-->
                                                                 <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
                                                             </Border.Shadow>
-                                                            <StackLayout VerticalOptions="Center" HorizontalOptions="Center">
+                                                            <StackLayout x:DataType="local:MealCalorieConsumed" VerticalOptions="Center" HorizontalOptions="Center">
                                                                 <Label Text="{Binding CaloriesFromProtein}" FontSize="28" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HorizontalTextAlignment="Center"/>
                                                                 <Label Text="Protein" FontSize="14" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Dark={DynamicResource SecondaryTextColorDark}, Light={DynamicResource SecondaryTextColorLight}}" HorizontalTextAlignment="Center"/>
                                                                 <BoxView Color="{Binding NutrientColorValue.ProteinColor}" WidthRequest="52" HeightRequest="4" HorizontalOptions="Center" Margin="0,2,0,0" />
                                                             </StackLayout>
                                                         </Border>
 
-                                                        <Border Grid.Row="0" Grid.Column="2" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}" HorizontalOptions="FillAndExpand" Margin="5,0,0,0" >
+                                                        <Border Grid.Row="0" Grid.Column="2" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}" HorizontalOptions="Fill" Margin="5,0,0,0" >
                                                             <Border.Shadow>
                                                                 <!--Combined Shadow Effect-->
                                                                 <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
                                                             </Border.Shadow>
-                                                            <StackLayout VerticalOptions="Center" HorizontalOptions="Center">
+                                                            <StackLayout x:DataType="local:MealCalorieConsumed" VerticalOptions="Center" HorizontalOptions="Center">
                                                                 <Label Text="{Binding CaloriesFromCarbs}" FontSize="28" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HorizontalTextAlignment="Center"/>
                                                                 <Label Text="Carbs" FontSize="14" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Dark={DynamicResource SecondaryTextColorDark}, Light={DynamicResource SecondaryTextColorLight}}" HorizontalTextAlignment="Center"/>
                                                                 <BoxView Color="{Binding NutrientColorValue.CarbsColor}" WidthRequest="52" HeightRequest="4" HorizontalOptions="Center" Margin="0,2,0,0" />
                                                             </StackLayout>
                                                         </Border>
 
-                                                        <Border Grid.Row="1" Grid.Column="0" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="FillAndExpand" Margin="0,0,5,0">
+                                                        <Border Grid.Row="1" Grid.Column="0" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="Fill" Margin="0,0,5,0">
                                                             <Border.Shadow>
                                                                 <!--Combined Shadow Effect-->
                                                                 <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
                                                             </Border.Shadow>
-                                                            <StackLayout VerticalOptions="Center" HorizontalOptions="Center">
+                                                            <StackLayout x:DataType="local:MealCalorieConsumed" VerticalOptions="Center" HorizontalOptions="Center">
                                                                 <Label Text="{Binding CaloriesFromVitamin}" FontSize="28" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HorizontalTextAlignment="Center"/>
                                                                 <Label Text="Vitamin" FontSize="14" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Dark={DynamicResource SecondaryTextColorDark}, Light={DynamicResource SecondaryTextColorLight}}" HorizontalTextAlignment="Center"/>
                                                                 <BoxView Color="{Binding NutrientColorValue.VitaminColor}" WidthRequest="52" HeightRequest="4" HorizontalOptions="Center" Margin="0,2,0,0" />
                                                             </StackLayout>
                                                         </Border>
 
-                                                        <Border Grid.Row="1" Grid.Column="1" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="FillAndExpand" Margin="5,0,5,0">
+                                                        <Border Grid.Row="1" Grid.Column="1" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="Fill" Margin="5,0,5,0">
                                                             <Border.Shadow>
                                                                 <!--Combined Shadow Effect-->
                                                                 <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
                                                             </Border.Shadow>
-                                                            <StackLayout VerticalOptions="Center" HorizontalOptions="Center">
+                                                            <StackLayout x:DataType="local:MealCalorieConsumed" VerticalOptions="Center" HorizontalOptions="Center">
                                                                 <Label Text="{Binding CaloriesFromCalcium}" FontSize="28" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HorizontalTextAlignment="Center"/>
                                                                 <Label Text="Calcium" FontSize="14" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Dark={DynamicResource SecondaryTextColorDark}, Light={DynamicResource SecondaryTextColorLight}}" HorizontalTextAlignment="Center"/>
                                                                 <BoxView Color="{Binding NutrientColorValue.CalciumColor}" WidthRequest="52" HeightRequest="4" HorizontalOptions="Center" Margin="0,2,0,0" />
                                                             </StackLayout>
                                                         </Border>
 
-                                                        <Border Grid.Row="1" Grid.Column="2" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="FillAndExpand" Margin="5,0,0,0">
+                                                        <Border Grid.Row="1" Grid.Column="2" Stroke="Gray" StrokeThickness="1" BackgroundColor="{AppThemeBinding Light={DynamicResource BackgroundColorLight}, Dark={DynamicResource BackgroundColorDark}}"  HorizontalOptions="Fill" Margin="5,0,0,0">
                                                             <Border.Shadow>
                                                                 <!--Combined Shadow Effect-->
                                                                 <Shadow Brush="{AppThemeBinding Dark={DynamicResource SeparatorColorDark}, Light={DynamicResource SeparatorColorLight}}" Offset="0,1" Radius="3" />
                                                             </Border.Shadow>
-                                                            <StackLayout VerticalOptions="Center" HorizontalOptions="Center">
+                                                            <StackLayout x:DataType="local:MealCalorieConsumed" VerticalOptions="Center" HorizontalOptions="Center">
                                                                 <Label Text="{Binding CaloriesFromFat}" FontSize="28" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HorizontalTextAlignment="Center"/>
                                                                 <Label Text="Fat" FontSize="14" FontFamily="Roboto-Thin" TextColor="{AppThemeBinding Dark={DynamicResource SecondaryTextColorDark}, Light={DynamicResource SecondaryTextColorLight}}" HorizontalTextAlignment="Center"/>
                                                                 <BoxView Color="{Binding NutrientColorValue.FatColor}" WidthRequest="52" HeightRequest="4" HorizontalOptions="Center" Margin="0,2,0,0" />
@@ -219,16 +219,16 @@
                             </Grid>
                         </Grid>
 
-                        <Grid Grid.Column="{OnPlatform WinUI='2',MacCatalyst='2'}" Grid.Row="{OnPlatform Android='0', iOS='0'}" VerticalOptions="FillAndExpand" HorizontalOptions="{OnPlatform WinUI=End, MacCatalyst=End, Android=Start}" Margin="{OnPlatform WinUI='0,0,10,0', MacCatalyst='0,0,10,0'}">
-                            <BoxView WidthRequest="8" HorizontalOptions="Start" VerticalOptions="FillAndExpand" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" />
+                        <Grid x:DataType="local:HealthCareViewModel" Grid.Column="{OnPlatform WinUI='2',MacCatalyst='2'}" Grid.Row="{OnPlatform Android='0', iOS='0'}" VerticalOptions="Fill" HorizontalOptions="{OnPlatform WinUI=End, MacCatalyst=End, Android=Start}" Margin="{OnPlatform WinUI='0,0,10,0', MacCatalyst='0,0,10,0'}">
+                            <BoxView WidthRequest="8" HorizontalOptions="Start" VerticalOptions="Fill" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" />
                             <Grid RowDefinitions="{OnPlatform WinUI='*,*',MacCatalyst='Auto,*', Android='Auto,*', iOS='Auto,*'}" RowSpacing="0">
                                 <Grid Grid.Row="0" RowDefinitions="{OnPlatform WinUI='*,*', MacCatalyst='*,*'}">
                                     <HorizontalStackLayout Grid.Row="0" VerticalOptions="Start" IsVisible="{OnPlatform Android=False, iOS=False}">
                                         <Label Text="Tracking" FontSize="22" FontFamily="Roboto-Regular" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" HeightRequest="28" Margin="16,16,0,16"></Label>
                                     </HorizontalStackLayout>
                                     <Grid Grid.Row="1" RowDefinitions="*,*" ColumnDefinitions="*,*" HorizontalOptions="Fill" VerticalOptions="{OnPlatform WinUI='StartAndExpand',MacCatalyst='Start', Android='FillAndExpand', iOS='FillAndExpand'}" Margin="{OnPlatform WinUI='8,0,0,0',MacCatalyst='8,0,0,0', Android='0,16,0,0', iOS='0,16,0,0'}">
-                                        <Border  BindingContext="{Binding TrackingNutrientData[0]}" Grid.Row="0" Grid.Column="0" Margin='16,0,8,16' Stroke="Transparent" StrokeThickness="0" StrokeShape="RoundRectangle 4,4,4,4" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HeightRequest="{OnPlatform Android=136, iOS=136}" >
-                                            <Grid RowDefinitions="*" VerticalOptions="FillAndExpand">
+                                        <Border  BindingContext="{Binding TrackingNutrientData[0]}" Grid.Row="0" Grid.Column="0" Margin='16,0,8,16' Stroke="Transparent" StrokeThickness="0" StrokeShape="RoundRectangle 4,4,4,4" HorizontalOptions="Fill" VerticalOptions="Fill" HeightRequest="{OnPlatform Android=136, iOS=136}" >
+                                            <Grid x:DataType="local:HealthCareModel" RowDefinitions="*" VerticalOptions="Fill">
                                                 <Grid Padding="0"  RowDefinitions="2*,1*,1*">
                                                     <Grid.Background>
                                                         <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
@@ -242,8 +242,8 @@
                                                 </Grid>
                                             </Grid>
                                         </Border>
-                                        <Border BindingContext="{Binding TrackingNutrientData[1]}" Grid.Row="0" Grid.Column="1" Margin='8,0,16,16' Stroke="Transparent" StrokeThickness="0" StrokeShape="RoundRectangle 4,4,4,4" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HeightRequest="{OnPlatform Android=136, iOS=136}" >
-                                            <Grid RowDefinitions="{OnPlatform WinUI='Auto',MacCatalyst='Auto', Android='*', iOS='*'}" VerticalOptions="FillAndExpand">
+                                        <Border BindingContext="{Binding TrackingNutrientData[1]}" Grid.Row="0" Grid.Column="1" Margin='8,0,16,16' Stroke="Transparent" StrokeThickness="0" StrokeShape="RoundRectangle 4,4,4,4" HorizontalOptions="Fill" VerticalOptions="Fill" HeightRequest="{OnPlatform Android=136, iOS=136}" >
+                                            <Grid x:DataType="local:HealthCareModel" RowDefinitions="{OnPlatform WinUI='Auto',MacCatalyst='Auto', Android='*', iOS='*'}" VerticalOptions="Fill">
                                                 <Grid Padding="0"  RowDefinitions="Auto,Auto,Auto">
                                                     <Grid.Background>
                                                         <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
@@ -257,8 +257,8 @@
                                                 </Grid>
                                             </Grid>
                                         </Border>
-                                        <Border BindingContext="{Binding TrackingNutrientData[2]}" Grid.Row="1" Grid.Column="0" Margin='16,0,8,16' Stroke="Transparent" StrokeThickness="0" StrokeShape="RoundRectangle 4,4,4,4" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" HeightRequest="{OnPlatform Android=136, iOS=136}" >
-                                            <Grid RowDefinitions="{OnPlatform WinUI='Auto',MacCatalyst='Auto', Android='*', iOS='*'}" VerticalOptions="FillAndExpand">
+                                        <Border BindingContext="{Binding TrackingNutrientData[2]}" Grid.Row="1" Grid.Column="0" Margin='16,0,8,16' Stroke="Transparent" StrokeThickness="0" StrokeShape="RoundRectangle 4,4,4,4" HorizontalOptions="Fill" VerticalOptions="Fill" HeightRequest="{OnPlatform Android=136, iOS=136}" >
+                                            <Grid x:DataType="local:HealthCareModel" RowDefinitions="{OnPlatform WinUI='Auto',MacCatalyst='Auto', Android='*', iOS='*'}" VerticalOptions="Fill">
                                                 <Grid Padding="0"  RowDefinitions="Auto,Auto,Auto">
                                                     <Grid.Background>
                                                         <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
@@ -272,8 +272,8 @@
                                                 </Grid>
                                             </Grid>
                                         </Border>
-                                        <Border BindingContext="{Binding TrackingNutrientData[3]}" Grid.Row="1" Grid.Column="1" Margin='8,0,16,16' Stroke="Transparent" StrokeThickness="0" StrokeShape="RoundRectangle 4,4,4,4" HeightRequest="{OnPlatform Android=136, iOS=136}" HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand" >
-                                            <Grid RowDefinitions="{OnPlatform WinUI='Auto',MacCatalyst='Auto', Android='*', iOS='*'}" VerticalOptions="FillAndExpand">
+                                        <Border BindingContext="{Binding TrackingNutrientData[3]}" Grid.Row="1" Grid.Column="1" Margin='8,0,16,16' Stroke="Transparent" StrokeThickness="0" StrokeShape="RoundRectangle 4,4,4,4" HeightRequest="{OnPlatform Android=136, iOS=136}" HorizontalOptions="Fill" VerticalOptions="Fill" >
+                                            <Grid x:DataType="local:HealthCareModel" RowDefinitions="{OnPlatform WinUI='Auto',MacCatalyst='Auto', Android='*', iOS='*'}" VerticalOptions="Fill">
                                                 <Grid Padding="0"  RowDefinitions="Auto,Auto,Auto">
                                                     <Grid.Background>
                                                         <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
@@ -293,18 +293,18 @@
                                     <listView:SfListView Grid.Row="1" IsScrollingEnabled="False" ItemSize="80" ItemsSource="{Binding TrackingData}" SelectionMode="None">
                                         <listView:SfListView.ItemTemplate>
                                             <DataTemplate>
-                                                <Border HeightRequest="72" Stroke="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource BackgroundColorDark}}" StrokeThickness="2" StrokeShape="RoundRectangle 4,4,4,4" BackgroundColor="{AppThemeBinding Dark={DynamicResource BackgroundColorDark}, Light={DynamicResource BackgroundColorLight}}" Margin="16,0,16,0">
+                                                <Border x:DataType="local:HealthCareModel" HeightRequest="72" Stroke="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource BackgroundColorDark}}" StrokeThickness="2" StrokeShape="RoundRectangle 4,4,4,4" BackgroundColor="{AppThemeBinding Dark={DynamicResource BackgroundColorDark}, Light={DynamicResource BackgroundColorLight}}" Margin="16,0,16,0">
                                                     <Border.Shadow>
                                                         <!-- First Shadow -->
                                                         <Shadow Brush="#000000" Offset="0,1" Radius="3" Opacity="0.15" />
                                                     </Border.Shadow>
                                                     <Grid ColumnDefinitions="Auto,*">
                                                         <BoxView BackgroundColor="{Binding BackgroundGradientStart}" CornerRadius="4,0,4,0" HorizontalOptions="Center" WidthRequest="4"  HeightRequest="72" />
-                                                        <Grid Grid.Column="1" RowDefinitions="*, *" ColumnDefinitions="*,Auto" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" Margin="8,0,8,0">
+                                                        <Grid Grid.Column="1" RowDefinitions="*, *" ColumnDefinitions="*,Auto" VerticalOptions="Fill" HorizontalOptions="Fill" Margin="8,0,8,0">
                                                             <Label Grid.Row="0" Grid.Column="0" LineHeight="1.5" CharacterSpacing="0.15" HorizontalTextAlignment="Start" Text="{Binding Category}" FontFamily="Roboto-Medium" Margin="0,10,0,0"/>
                                                             <Label Grid.Row="0" Grid.Column="1" Text="{Binding CategoryValue}" VerticalOptions="Center" HorizontalOptions="End" FontFamily="Roboto-Medium" LineHeight="1.5" CharacterSpacing="0.15" Margin="0,10,0,0"/>
                                                             <Label Grid.Row="1" Grid.Column="0" FontAttributes="None"  LineHeight="1.42857" TextColor="{AppThemeBinding Light={DynamicResource ContentTextColorLight}, Dark={DynamicResource ContentTextColorDark}}" CharacterSpacing="0.25" HorizontalTextAlignment="Start" Text="{Binding CategoryPercentage}" FontFamily="Roboto-Medium" Margin="0,0,0,10"/>
-                                                            <Label Grid.Row="1" Grid.Column="1" FontAttributes="None" LineHeight="1.42857" Text="{Binding CategoryStage}" CharacterSpacing="0.25" HorizontalOptions="EndAndExpand" FontFamily="Roboto-Medium" Margin="0,0,0,10" TextColor="{Binding CategoryStageColor}"/>
+                                                            <Label Grid.Row="1" Grid.Column="1" FontAttributes="None" LineHeight="1.42857" Text="{Binding CategoryStage}" CharacterSpacing="0.25" HorizontalOptions="End" FontFamily="Roboto-Medium" Margin="0,0,0,10" TextColor="{Binding CategoryStageColor}"/>
                                                         </Grid>
                                                     </Grid>
                                                 </Border>
diff --git a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/MyWalletPage.xaml b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/MyWalletPage.xaml
index 7cc99dd..fa00726 100644
--- a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/MyWalletPage.xaml
+++ b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/MyWalletPage.xaml
@@ -8,7 +8,8 @@
              xmlns:listView="clr-namespace:Syncfusion.Maui.ListView;assembly=Syncfusion.Maui.ListView"
              xmlns:converter="clr-namespace:EssentialMAUIUIKit.Converters"   
              xmlns:rotator="clr-namespace:Syncfusion.Maui.Rotator;assembly=Syncfusion.Maui.Rotator"
-             xmlns:local="clr-namespace:EssentialMAUIUIKit"             
+             xmlns:local="clr-namespace:EssentialMAUIUIKit"
+             x:DataType="local:MyWalletViewModel"
              xmlns:syncfusion="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core">
 
     <ContentView.BindingContext>
@@ -22,7 +23,7 @@
             <ResourceDictionary>
                 <DataTemplate x:Key="RegularCardTemplate">
                     <StackLayout Margin="0,0,20,0">
-                        <Border Margin="10,0" HeightRequest="175" WidthRequest="343" Stroke="Transparent" StrokeThickness="0" StrokeShape="RoundRectangle 6,6,6,6">
+                        <Border x:DataType="local:CardDetails" Margin="10,0" HeightRequest="175" WidthRequest="343" Stroke="Transparent" StrokeThickness="0" StrokeShape="RoundRectangle 6,6,6,6">
                             <Border.Background>
                                 <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
                                     <GradientStop Color="{Binding ColorGradientStart}" Offset="0"/>
@@ -120,18 +121,18 @@
                     <syncfusion:SfAvatarView ContentType="Custom" AvatarSize="Medium" AvatarShape="Circle" ImageSource="{Binding ProfileImage}" HorizontalOptions="End" Background="White" Margin="0,0,24,0" IsVisible="{OnPlatform Android=False, iOS=False}"/>
                 </Grid>
                 <BoxView HeightRequest="1" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Fill" />
-                <Grid RowDefinitions="{OnPlatform WinUI='*', MacCatalyst='*'}" VerticalOptions="FillAndExpand" ColumnDefinitions="*" HorizontalOptions="FillAndExpand">
-                    <Grid ColumnDefinitions="{OnPlatform WinUI='Auto,Auto,*', MacCatalyst='Auto,Auto,*'}" RowDefinitions="*" VerticalOptions="FillAndExpand" HeightRequest="{OnPlatform MacCatalyst={Binding LayoutHeight}}">
+                <Grid RowDefinitions="{OnPlatform WinUI='*', MacCatalyst='*'}" VerticalOptions="Fill" ColumnDefinitions="*" HorizontalOptions="Fill">
+                    <Grid ColumnDefinitions="{OnPlatform WinUI='Auto,Auto,*', MacCatalyst='Auto,Auto,*'}" RowDefinitions="*" VerticalOptions="Fill" HeightRequest="{OnPlatform MacCatalyst={Binding LayoutHeight}}">
 
                         <!-- Menu Item list -->
-                        <Grid Grid.Column="0" VerticalOptions="StartAndExpand" WidthRequest="{OnPlatform MacCatalyst=350}" HorizontalOptions="Start" IsVisible="{OnPlatform Android=False, iOS=False}">
+                        <Grid Grid.Column="0" VerticalOptions="Start" WidthRequest="{OnPlatform MacCatalyst=350}" HorizontalOptions="Start" IsVisible="{OnPlatform Android=False, iOS=False}">
                             <VerticalStackLayout>
                                 <CollectionView ItemsSource="{Binding MenuItemList}">
                                     <CollectionView.ItemTemplate>
                                         <DataTemplate>
                                             <Border Padding="10" Stroke="Transparent">
                                                 <!-- Menu Item Text -->
-                                                <Label Text="{Binding Name}" FontSize="14" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" VerticalOptions="Center" Margin="0,0,5,0">
+                                                <Label x:DataType="local:MyWalletMenuItems" Text="{Binding Name}" FontSize="14" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" VerticalOptions="Center" Margin="0,0,5,0">
                                                     <Label.Triggers>
                                                         <DataTrigger TargetType="Label" Binding="{Binding IsSelected}" Value="True">
                                                             <Setter Property="TextColor" Value="{StaticResource PrimaryFormsColor}" />
@@ -144,24 +145,24 @@
                                 </CollectionView>
                             </VerticalStackLayout>
                         </Grid>
-                        <BoxView Grid.Column="1"  WidthRequest="1" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Start" VerticalOptions="FillAndExpand" IsVisible="{OnPlatform Android=False, iOS=False}"/>
+                        <BoxView Grid.Column="1"  WidthRequest="1" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Start" VerticalOptions="Fill" IsVisible="{OnPlatform Android=False, iOS=False}"/>
                         <!-- Card Details-->
                         <!--<ScrollView  Orientation="Vertical" VerticalScrollBarVisibility="Never" VerticalOptions="Fill">-->
-                        <Grid Grid.Column="{OnPlatform WinUI=2,MacCatalyst=2}" RowDefinitions="{OnPlatform WinUI='1* ,Auto, 3*',MacCatalyst='Auto,Auto, *', Android='Auto,*', iOS='Auto,*'}" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
+                        <Grid Grid.Column="{OnPlatform WinUI=2,MacCatalyst=2}" RowDefinitions="{OnPlatform WinUI='1* ,Auto, 3*',MacCatalyst='Auto,Auto, *', Android='Auto,*', iOS='Auto,*'}" VerticalOptions="Fill" HorizontalOptions="Fill">
                             <ScrollView Grid.Row="0" HeightRequest="{OnPlatform MacCatalyst='240', WinUI=240}" Orientation="Horizontal" HorizontalOptions="Fill" HorizontalScrollBarVisibility="Default" VerticalScrollBarVisibility="Never">
-                                <HorizontalStackLayout  Margin="{OnPlatform WinUI='0,16,0,16',MacCatalyst='0,16,0,16', Android='32,16,0,16', iOS='16,16,16,16'}" HorizontalOptions="Center" VerticalOptions="Center">
-                                    <rotator:SfRotator ItemsSource="{Binding CardDetails}" HorizontalOptions="Center" VerticalOptions="Start" HeightRequest="200" WidthRequest="343" SelectedDotColor="{OnPlatform Default='White', Android='#7633DA',iOS='#7633DA'}" UnselectedDotColor="{OnPlatform Default='White', Android='#FCF8FA',iOS='#FCF8FA'}" IsVisible="{OnPlatform WinUI='False', MacCatalyst='False'}" >
+                                <HorizontalStackLayout Margin="{OnPlatform WinUI='0,16,0,16',MacCatalyst='0,16,0,16', Android='32,16,0,16', iOS='16,16,16,16'}" HorizontalOptions="Center" VerticalOptions="Center">
+                                    <rotator:SfRotator EnableLooping="False" ItemsSource="{Binding CardDetails}" HorizontalOptions="Center" VerticalOptions="Start" HeightRequest="200" WidthRequest="343" SelectedDotColor="{OnPlatform Default='White', Android='#7633DA',iOS='#7633DA'}" UnselectedDotColor="{OnPlatform Default='White', Android='#FCF8FA',iOS='#FCF8FA'}" IsVisible="{OnPlatform WinUI='False', MacCatalyst='False'}" >
                                         <rotator:SfRotator.ItemTemplate>
                                             <local:CardTemplateSelector RegularTemplate="{StaticResource RegularCardTemplate}" LastItemTemplate="{StaticResource LastCardTemplate}" />
                                         </rotator:SfRotator.ItemTemplate>
                                     </rotator:SfRotator>
-                                    <CollectionView ItemsSource="{Binding FilteredCardDetails}" HorizontalScrollBarVisibility="Never" HorizontalOptions="FillAndExpand" VerticalOptions="Start" IsVisible="{OnPlatform Android='False', iOS='False'}">
+                                    <CollectionView ItemsSource="{Binding FilteredCardDetails}" HorizontalScrollBarVisibility="Never" HorizontalOptions="Fill" VerticalOptions="Start" IsVisible="{OnPlatform Android='False', iOS='False'}">
                                         <CollectionView.ItemsLayout>
                                             <LinearItemsLayout Orientation="Horizontal"/>
                                         </CollectionView.ItemsLayout>
                                         <CollectionView.ItemTemplate>
                                             <DataTemplate>
-                                                <StackLayout Margin="0,0,20,0" IsVisible="{Binding IsVisible}">
+                                                <StackLayout x:DataType="local:CardDetails" Margin="0,0,20,0" IsVisible="{Binding IsVisible}">
                                                     <Border Margin="10,0" HeightRequest="200" WidthRequest="343" Stroke="Transparent" StrokeThickness="0" StrokeShape="RoundRectangle 6,6,6,6">
                                                         <Grid Padding="10"  RowDefinitions="*,*,Auto">
                                                             <Grid.Background>
@@ -222,7 +223,7 @@
                                 <Grid Grid.Column="{OnPlatform WinUI='0',MacCatalyst=0}" Grid.Row="{OnPlatform Android='0', iOS='0'}" RowDefinitions='Auto,Auto,*' Margin="{OnPlatform WinUI='16,16,16,0'}">
                                     <!-- Available Balance-->
                                     <Grid BindingContext="{Binding SelectedCard}" Grid.Row="0" HeightRequest="{OnPlatform WinUI=88,MacCatalyst=88}" Margin="16,16,16,0">
-                                        <Border HeightRequest="73" Background="{AppThemeBinding Light={DynamicResource Gray-Black}, Dark={DynamicResource Gray-White}}" StrokeShape="RoundRectangle 5,5,5,5" Margin="0,0,0,16">
+                                        <Border HeightRequest="73" x:DataType="local:CardDetails" Background="{AppThemeBinding Light={DynamicResource Gray-Black}, Dark={DynamicResource Gray-White}}" StrokeShape="RoundRectangle 5,5,5,5" Margin="0,0,0,16">
                                             <Grid ColumnDefinitions="*,*" RowDefinitions="*,*" Margin="8,8,8,8">
                                                 <Label Grid.Row="0" Grid.Column="0" Text="{Binding CardHolderName}" HorizontalOptions="Start" TextColor="{AppThemeBinding Light={DynamicResource Gray-White}, Dark={DynamicResource Gray-Black}}" FontSize="16" FontFamily="Roboto-Regular" />
                                                 <Label Grid.Row="0" Grid.Column="1" Text="Avl Balance" HorizontalOptions="End" TextColor="{AppThemeBinding Light={DynamicResource Gray-White}, Dark={DynamicResource Gray-Black}}" FontSize="12" FontFamily="Roboto-Thin" HeightRequest="16"/>
@@ -231,12 +232,12 @@
                                             </Grid>
                                         </Border>
                                     </Grid>
-                                    <BoxView Grid.Row="1" HeightRequest="8" Color="#FCF8FA" HorizontalOptions="FillAndExpand" IsVisible="{OnPlatform WinUI='False', MacCatalyst='False'}"/>
+                                    <BoxView Grid.Row="1" HeightRequest="8" Color="#FCF8FA" HorizontalOptions="Fill" IsVisible="{OnPlatform WinUI='False', MacCatalyst='False'}"/>
                                     <Grid Grid.Row="2" RowDefinitions="Auto,*" VerticalOptions="{OnPlatform WinUI='Fill', MacCatalyst='Fill'}" Margin="16,16,16,0">
 
                                         <!-- Combo Box -->
                                         <StackLayout Grid.Row="0" HeightRequest="{OnPlatform WinUI=40, MacCatalyst=40}" Margin="0,0,0,10">
-                                            <Grid HorizontalOptions="FillAndExpand">
+                                            <Grid HorizontalOptions="Fill">
                                                 <Label Text="{Binding ChartLabel}" HorizontalOptions="Start" VerticalOptions="Center" FontFamily="Roboto-Medium" FontSize="{OnPlatform MacCatalyst=24}" FontAttributes="Bold"></Label>
                                                 <Border BackgroundColor="{AppThemeBinding Light={DynamicResource Gray-White}, Dark={DynamicResource GrayBorderBackgroundColor}}"
 VerticalOptions="End" StrokeShape="RoundRectangle 20,20,20,20" HeightRequest="40" WidthRequest="85" Margin="{OnPlatform Android='0,0,10,0', iOS='0,0,10,0'}" HorizontalOptions="End">
@@ -271,24 +272,27 @@ VerticalOptions="End" StrokeShape="RoundRectangle 20,20,20,20" HeightRequest="40
                                                                         HorizontalTextAlignment="Center"
                                                                         Text="{DynamicResource DropDownButtonIcon}"
                                                                         TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"
-                                                                                                                        FontAttributes="Bold"
+                                                                        FontAttributes="Bold"
                                                                         VerticalTextAlignment="Center"/>
                                                                 </combobox:DropDownButtonSettings.View>
                                                             </combobox:DropDownButtonSettings>
                                                         </combobox:SfComboBox.DropDownButtonSettings>
                                                         <combobox:SfComboBox.CustomView>
-
                                                             <Label
-                                                                BindingContext="{Binding SelectedItem, Source={x:Reference comboBox}}"
                                                                 FontFamily="Roboto-Regular"
                                                                 FontSize="14" 
+                                                                x:DataType="local:PaymentDetail"
                                                                 FontAttributes="Bold"
                                                                 HorizontalOptions="Start"
                                                                 HorizontalTextAlignment="Start"
-                                                                Text="{Binding Duration}"
                                                                 TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"
                                                                 VerticalOptions="Center"
-                                                                VerticalTextAlignment="Center" Margin="{OnPlatform WinUI='16,0,0,0', MacCatalyst='16,0,0,0'}"/>
+                                                                Text="{Binding Duration}"
+                                                                VerticalTextAlignment="Center" Margin="{OnPlatform WinUI='16,0,0,0', MacCatalyst='16,0,0,0'}">
+                                                                <Label.BindingContext>
+                                                                    <x:Binding x:DataType="combobox:SfComboBox" Source="{x:Reference comboBox}" Path="SelectedItem"/>
+                                                                </Label.BindingContext>
+                                                            </Label>
 
                                                         </combobox:SfComboBox.CustomView>
                                                     </combobox:SfComboBox>
@@ -335,9 +339,9 @@ VerticalOptions="End" StrokeShape="RoundRectangle 20,20,20,20" HeightRequest="40
                                 </Grid>
 
                                 <!-- Vertical Border Line -->
-                                <BoxView Grid.Column="1" WidthRequest="8" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" VerticalOptions="FillAndExpand" IsVisible="{OnPlatform Android='False', iOS='False'}"/>
+                                <BoxView Grid.Column="1" WidthRequest="8" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" VerticalOptions="Fill" IsVisible="{OnPlatform Android='False', iOS='False'}"/>
                                 <!--Horizontal Border Line-->
-                                <BoxView Grid.Row="{OnPlatform Android='1', iOS='1'}" HeightRequest="8" Color="#FCF8FA" HorizontalOptions="FillAndExpand" IsVisible="{OnPlatform WinUI='False', MacCatalyst='False'}" VerticalOptions="{OnPlatform Android='Start'}"/>
+                                <BoxView Grid.Row="{OnPlatform Android='1', iOS='1'}" HeightRequest="8" Color="#FCF8FA" HorizontalOptions="Fill" IsVisible="{OnPlatform WinUI='False', MacCatalyst='False'}" VerticalOptions="{OnPlatform Android='Start'}"/>
                                 <!-- Transaction Details -->
                                 <Grid Grid.Column="2" Grid.Row="{OnPlatform Android='1', iOS='1'}" RowDefinitions="Auto, *" Margin="16,16,16,16">
                                     <Label Grid.Row="0" HeightRequest="{OnPlatform WinUI=30, MacCatalyst=30}" Text="Transactions" FontFamily="Roboto-Regular" FontSize="{OnPlatform WinUI=22, MacCatalyst=22, Android=14, iOS=14}" FontAttributes="{OnPlatform Android='Bold', iOS='Bold'}" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" />
@@ -350,7 +354,7 @@ VerticalOptions="End" StrokeShape="RoundRectangle 20,20,20,20" HeightRequest="40
                                         SelectionBackground="{AppThemeBinding Light={DynamicResource SelectionBackgroundLight}, Dark={DynamicResource SelectionBackgroundDark}}" Margin="{OnPlatform WinUI='0,16,0,0',MacCatalyst='0,16,0,0', Android='0,8,0,0', iOS='0,8,0,0'}">
                                         <listView:SfListView.ItemTemplate>
                                             <DataTemplate>
-                                                <StackLayout Spacing="0">
+                                                <StackLayout x:DataType="local:PaymentDetail" Spacing="0">
                                                     <Grid
                                                         ColumnDefinitions="Auto, *, *"
                                                         ColumnSpacing="0"                   
diff --git a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/RestaurantDashboardPage.xaml b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/RestaurantDashboardPage.xaml
index 20eab4b..810d607 100644
--- a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/RestaurantDashboardPage.xaml
+++ b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/RestaurantDashboardPage.xaml
@@ -2,7 +2,8 @@
 <ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="EssentialMAUIUIKit.Views.Dashboard.RestaurantDashboardPage"
-             xmlns:local="clr-namespace:EssentialMAUIUIKit"             
+             xmlns:local="clr-namespace:EssentialMAUIUIKit"       
+             x:DataType="local:RestaurantDashboardViewModel"
              xmlns:syncfusion="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core">
     <ContentView.BindingContext>
         <local:RestaurantDashboardViewModel/>
@@ -35,7 +36,7 @@
                                         <DataTemplate>
                                             <Border Padding="10" Stroke="Transparent">
                                                 <!-- Menu Item Text -->
-                                                <Label Text="{Binding Name}" FontSize="16" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" VerticalOptions="Center" Margin="0,0,5,0">
+                                                <Label x:DataType="local:RestaurantDashboardMenuItem" Text="{Binding Name}" FontSize="16" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" VerticalOptions="Center" Margin="0,0,5,0">
                                                     <Label.Triggers>
                                                         <DataTrigger TargetType="Label" Binding="{Binding IsSelected}" Value="True">
                                                             <Setter Property="TextColor" Value="{StaticResource PrimaryFormsColor}" />
@@ -77,7 +78,7 @@
                                             <Border.Shadow>
                                                 <Shadow Brush="#00000026" Offset="0,1" Radius="0.3" Opacity="0.15" />
                                             </Border.Shadow>
-                                            <Grid Padding="8" Margin="8,8,8,8">
+                                            <Grid x:DataType="local:RevenueSummary" Padding="8" Margin="8,8,8,8">
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition Height="*" />
                                                     <RowDefinition Height="*" />
@@ -110,19 +111,19 @@
                             </CollectionView>
                             <Label Grid.Row="1" Text="Orders list" FontFamily="Roboto-Medium" FontSize="{OnPlatform WinUI=22, MacCatalyst=22, Android=16, iOS=16}" Margin="32,16,0,16" />
                             <BoxView Grid.Row="2" HorizontalOptions="Fill" VerticalOptions="Start" HeightRequest="1" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" />
-                            <Grid Grid.Row="3" ColumnDefinitions="{OnPlatform WinUI='1.5*,2*,2*,2*,1*', MacCatalyst='1.5*,2*,2*,2*,1*', Android='2*,1.5*,1*', iOS='2*,1.5*,1*'}" HorizontalOptions="FillAndExpand" Margin="0,16,0,8">
+                            <Grid Grid.Row="3" ColumnDefinitions="{OnPlatform WinUI='1.5*,2*,2*,2*,1*', MacCatalyst='1.5*,2*,2*,2*,1*', Android='2*,1.5*,1*', iOS='2*,1.5*,1*'}" HorizontalOptions="Fill" Margin="0,16,0,8">
                                 <Label Grid.Column="0" Text="{Binding OrderDetailsHeader[0]}" FontFamily="Roboto-Medium" FontSize="14" HorizontalOptions="Center"/>
                                 <Label Grid.Column="1" Text="{Binding OrderDetailsHeader[1]}" FontFamily="Roboto-Medium" FontSize="14" HorizontalOptions="Start"/>
                                 <Label Grid.Column="2" Text="{Binding OrderDetailsHeader[2]}" FontFamily="Roboto-Medium" FontSize="14" HorizontalOptions="Start" IsVisible="{OnPlatform Android=False, iOS=False}"/>
                                 <Label Grid.Column="3" Text="{Binding OrderDetailsHeader[3]}" FontFamily="Roboto-Medium" FontSize="14" HorizontalOptions="Start" IsVisible="{OnPlatform Android=False, iOS=False}"/>
                                 <Label Grid.Column="4" Text="{Binding OrderDetailsHeader[4]}" FontFamily="Roboto-Medium" FontSize="14" HorizontalOptions="Start"/>
                             </Grid>
-                            <BoxView Grid.Row="4" HorizontalOptions="FillAndExpand" VerticalOptions="Start" HeightRequest="1"  Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" />
+                            <BoxView Grid.Row="4" HorizontalOptions="Fill" VerticalOptions="Start" HeightRequest="1"  Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" />
                             <Grid Grid.Row="5" ColumnDefinitions="*" VerticalOptions="Fill" Margin="0,8,0,0">
                                 <CollectionView ItemsSource="{Binding OrderDetails}">
                                     <CollectionView.ItemTemplate>
                                         <DataTemplate>
-                                            <Grid ColumnDefinitions="{OnPlatform WinUI='1.5*,2*,2*,2*,1*', MacCatalyst='1.5*,2*,2*,2*,1*', Android='2*,1.5*,1*', iOS='2*,1.5*,1*'}" HeightRequest="46">
+                                            <Grid x:DataType="local:RestaurantOrder" ColumnDefinitions="{OnPlatform WinUI='1.5*,2*,2*,2*,1*', MacCatalyst='1.5*,2*,2*,2*,1*', Android='2*,1.5*,1*', iOS='2*,1.5*,1*'}" HeightRequest="46">
                                                 <Label Grid.Column="0" Text="{Binding OrderID}" FontFamily="Roboto-Regular" FontSize="14" HorizontalOptions="Center" VerticalOptions="Center"/>
                                                 <Label Grid.Column="1" Text="{Binding Date, StringFormat='{0:dd/MM/yyyy}'}" FontFamily="Roboto-Regular" FontSize="14" HorizontalOptions="Start" VerticalOptions="Center" />
                                                 <Label Grid.Column="2" Text="{Binding PaymentMode}" FontFamily="Roboto-Regular" FontSize="14" HorizontalOptions="Start" VerticalOptions="Center" IsVisible="{OnPlatform Android=False, iOS=False}" />
@@ -134,7 +135,7 @@
                                                         </FormattedString>
                                                     </Label.FormattedText>
                                                     <Label.GestureRecognizers>
-                                                        <TapGestureRecognizer Command="{Binding OnDetailsClicked}" />
+                                                        <TapGestureRecognizer/>
                                                     </Label.GestureRecognizers>
                                                 </Label>
                                             </Grid>
diff --git a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/StockOverviewPage.xaml b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/StockOverviewPage.xaml
index 7ea6d00..859e420 100644
--- a/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/StockOverviewPage.xaml
+++ b/EssentialMAUIUIKit/EssentialMAUIUIKit/Views/Dashboard/StockOverviewPage.xaml
@@ -9,13 +9,14 @@
              xmlns:picker="clr-namespace:Syncfusion.Maui.Picker;assembly=Syncfusion.Maui.Picker"
              xmlns:chart="clr-namespace:Syncfusion.Maui.Charts;assembly=Syncfusion.Maui.Charts"
              xmlns:popup="clr-namespace:Syncfusion.Maui.Popup;assembly=Syncfusion.Maui.Popup"
+             x:DataType="local:StockOverviewViewModel"
              xmlns:local="clr-namespace:EssentialMAUIUIKit">
     <ContentView.BindingContext>
         <local:StockOverviewViewModel/>
     </ContentView.BindingContext>
     <ContentView.Content>
         <ScrollView VerticalScrollBarVisibility="{OnPlatform Android=Never, iOS=Never, WinUI =Default, MacCatalyst=Default}">
-            <StackLayout HorizontalOptions="FillAndExpand">
+            <StackLayout HorizontalOptions="Fill">
                 <Grid HeightRequest="{OnPlatform WinUI=60,MacCatalyst=60}" Padding="0,10,24,10" IsVisible="{OnPlatform Android=False, iOS=False}">
                     <Label Text="Meinvest" FontSize="22" FontFamily="Righteous" VerticalOptions="Center" HorizontalOptions="Start" TextColor="{StaticResource PrimaryFormsColor}" Margin="{OnPlatform WinUI='24,0,0,0',MacCatalyst='24,0,0,0' }"/>
 
@@ -31,7 +32,7 @@
                 </Grid>
                 <BoxView HeightRequest="1" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Fill" />
 
-                <Grid ColumnDefinitions="{OnPlatform WinUI='Auto,Auto, 5*, Auto, 3*',MacCatalyst='Auto,Auto, 5*, Auto, 2*'}" RowDefinitions="{OnPlatform Android='Auto,Auto,Auto',iOS='Auto,Auto,Auto'}" VerticalOptions="FillAndExpand">
+                <Grid ColumnDefinitions="{OnPlatform WinUI='Auto,Auto, 5*, Auto, 3*',MacCatalyst='Auto,Auto, 5*, Auto, 2*'}" RowDefinitions="{OnPlatform Android='Auto,Auto,Auto',iOS='Auto,Auto,Auto'}" VerticalOptions="Fill">
 
                     <!-- Navigation layout -->
                     <Grid Grid.Column="0" WidthRequest="{OnPlatform MacCatalyst=350}" VerticalOptions="Start" HorizontalOptions="Start" IsVisible="{OnPlatform Android=False,iOS=False}">
@@ -41,7 +42,7 @@
                                     <DataTemplate>
                                         <Border Padding="16" Stroke="Transparent">
                                             <!-- Menu Item Text -->
-                                            <Label Text="{Binding Name}" FontSize="16" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" VerticalOptions="Center" Margin="0,0,5,0" FontFamily="Roboto-Regular">
+                                            <Label x:DataType="local:NavigationPages" Text="{Binding Name}" FontSize="16" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}" VerticalOptions="Center" Margin="0,0,5,0" FontFamily="Roboto-Regular">
                                                 <Label.Triggers>
                                                     <DataTrigger TargetType="Label" Binding="{Binding IsSelected}" Value="True">
                                                         <Setter Property="TextColor" Value="{StaticResource PrimaryFormsColor}" />
@@ -55,7 +56,7 @@
                         </VerticalStackLayout>
                     </Grid>
 
-                    <BoxView Grid.Column="{OnPlatform WinUI='1',MacCatalyst='1'}" WidthRequest="2" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Start" VerticalOptions="FillAndExpand" />
+                    <BoxView Grid.Column="{OnPlatform WinUI='1',MacCatalyst='1'}" WidthRequest="2" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" HorizontalOptions="Start" VerticalOptions="Fill" />
                     <!-- Chart Layout -->
                     <Grid Grid.Column="{OnPlatform WinUI='2',MacCatalyst='2'}" Grid.Row="{OnPlatform Android='0',iOS='0'}" VerticalOptions="Start">
 
@@ -63,8 +64,8 @@
                         <Grid Margin="{OnPlatform WinUI='10,0,10,10',MacCatalyst='10,0,10,10'}" RowDefinitions="{OnPlatform WinUI='Auto,Auto,*',MacCatalyst='Auto,Auto,3*', Android='Auto,*', iOS='Auto,*'}">
 
                             <!-- Market data -->
-                            <Grid Grid.Row="0" HeightRequest="{OnPlatform WinUI=212,MacCatalyst=250}" VerticalOptions="StartAndExpand">
-                                <Grid RowDefinitions="{OnPlatform WinUI='2*,2*',MacCatalyst='2*,2*', Android='*,*', iOS='*,*'}" VerticalOptions="{OnPlatform WinUI='StartAndExpand',MacCatalyst='StartAndExpand', Android='Start',iOS='Start'}">
+                            <Grid Grid.Row="0" HeightRequest="{OnPlatform WinUI=212,MacCatalyst=250}" VerticalOptions="Start">
+                                <Grid RowDefinitions="{OnPlatform WinUI='2*,2*',MacCatalyst='2*,2*', Android='*,*', iOS='*,*'}" VerticalOptions="{OnPlatform WinUI='Start',MacCatalyst='Start', Android='Start',iOS='Start'}">
                                     <Grid Grid.Row="0" ColumnDefinitions="*,*"  Margin="{OnPlatform WinUI='16,0,32,0',MacCatalyst='16,0,32,0', Android='32,16,16,0',iOS='32,32,16,0'}" HeightRequest="{OnPlatform WinUI=88,MacCatalyst=88}">
                                         <HorizontalStackLayout Grid.Column="0" HorizontalOptions="Start" HeightRequest="{OnPlatform WinUI=24,MacCatalyst=24}" Margin="{OnPlatform WinUI='16,0,0,0',MacCatalyst='16,0,0,0'}" VerticalOptions="Center">
                                             <Label Text="{Binding SelectedDate, StringFormat='{0:dd, MMM, yyyy}',Mode=TwoWay}" FontSize="16" FontFamily="Roboto-Regular" TextColor="{AppThemeBinding Light={DynamicResource PrimaryTextColorLight}, Dark={DynamicResource PrimaryTextColorDark}}"/>
@@ -86,10 +87,10 @@
                                             </Border>
                                         </HorizontalStackLayout>
                                     </Grid>
-                                    <Grid Grid.Row="1" ColumnDefinitions="*,*"  Margin="{OnPlatform WinUI='16,0,16,0',MacCatalyst='16,0,16,0', Android='32,16,16,0',iOS='32,16,16,0'}" VerticalOptions="CenterAndExpand">
+                                    <Grid Grid.Row="1" ColumnDefinitions="*,*"  Margin="{OnPlatform WinUI='16,0,16,0',MacCatalyst='16,0,16,0', Android='32,16,16,0',iOS='32,16,16,0'}" VerticalOptions="Center">
                                         <StackLayout Grid.Column="0" Margin="{OnPlatform WinUI='8,0,8,0',MacCatalyst='8,0,8,0'}">
                                             <!-- Nifty50 Data Display -->
-                                            <Border WidthRequest="{OnPlatform Android=166,iOS=166}" HeightRequest="{OnPlatform Android=73,iOS=73}" BackgroundColor="#9215F3" HorizontalOptions="{OnPlatform WinUI='FillAndExpand',MacCatalyst='FillAndExpand', Android='StartAndExpand'}" VerticalOptions="{OnPlatform WinUI='FillAndExpand',MacCatalyst='FillAndExpand'}">
+                                            <Border WidthRequest="{OnPlatform Android=166,iOS=166}" HeightRequest="{OnPlatform Android=73,iOS=73}" BackgroundColor="#9215F3" HorizontalOptions="{OnPlatform WinUI='FillAndExpand',MacCatalyst='FillAndExpand', Android='Start'}" VerticalOptions="{OnPlatform WinUI='FillAndExpand',MacCatalyst='FillAndExpand'}">
                                                 <Border.StrokeShape>
                                                     <RoundRectangle CornerRadius="8"/>
                                                 </Border.StrokeShape>
@@ -105,7 +106,7 @@
                                         </StackLayout>
                                         <StackLayout Grid.Column="1" Margin="{OnPlatform WinUI='8,0,8,0',MacCatalyst='8,0,8,0'}">
                                             <!-- Sensex Data Display -->
-                                            <Border WidthRequest="{OnPlatform Android=166,iOS=166}" HeightRequest="{OnPlatform Android=73,iOS=73}" BackgroundColor="#E2227E" HorizontalOptions="{OnPlatform WinUI='FillAndExpand',MacCatalyst='FillAndExpand', Android='StartAndExpand'}" VerticalOptions="{OnPlatform WinUI='FillAndExpand',MacCatalyst='FillAndExpand'}">
+                                            <Border WidthRequest="{OnPlatform Android=166,iOS=166}" HeightRequest="{OnPlatform Android=73,iOS=73}" BackgroundColor="#E2227E" HorizontalOptions="{OnPlatform WinUI='FillAndExpand',MacCatalyst='FillAndExpand', Android='Start'}" VerticalOptions="{OnPlatform WinUI='FillAndExpand',MacCatalyst='FillAndExpand'}">
                                                 <Border.StrokeShape>
                                                     <RoundRectangle CornerRadius="8"/>
                                                 </Border.StrokeShape>
@@ -127,9 +128,9 @@
                             <Grid Grid.Row="{OnPlatform WinUI='2',MacCatalyst='2', Android='1', iOS='1'}" RowDefinitions="Auto,Auto" VerticalOptions="Center">
                                 <syncfusion:SfChipGroup Grid.Row="0" ItemsSource="{Binding TimeVariant}" SelectedItem="{Binding SelectedVariant, Mode=TwoWay}" SelectionChanged="OnChipChanged" Background="Transparent" ChipStroke="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" SelectedChipBackground="{DynamicResource PrimaryFormsColor}" ChipFontFamily="Roboto-Medium" ChipTextColor="{AppThemeBinding Light={DynamicResource BackgroundColorDark}, Dark={DynamicResource BackgroundColorLight}}" SelectedChipTextColor="{DynamicResource BackgroundColorLight}" ChipCornerRadius="60" HeightRequest="130" WidthRequest="240" ChipType="Choice" VerticalOptions="Start" HorizontalOptions="Start" Margin="16,-16,0,0" />
                                 <Grid Grid.Row="1">
-                                    <StackLayout BackgroundColor="Transparent" VerticalOptions="StartAndExpand" Margin="0,0,0,0">
+                                    <StackLayout BackgroundColor="Transparent" VerticalOptions="Start" Margin="0,0,0,0">
                                         <Grid Margin="16,0,16,0" HeightRequest="{OnPlatform WinUI=210,MacCatalyst=500}" >
-                                            <chart:SfCartesianChart BackgroundColor="Transparent" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" HeightRequest="{OnPlatform Android=220, iOS=220}">
+                                            <chart:SfCartesianChart BackgroundColor="Transparent" VerticalOptions="Fill" HorizontalOptions="Fill" HeightRequest="{OnPlatform Android=220, iOS=220}">
                                                 <chart:SfCartesianChart.XAxes>
                                                     <chart:DateTimeAxis IntervalType="Months" Interval="1">
                                                         <chart:DateTimeAxis.LabelStyle>
@@ -176,18 +177,18 @@
                     </Grid>
                     <BoxView Grid.Column="{OnPlatform WinUI='3',MacCatalyst='3'}" WidthRequest="8" HorizontalOptions="Start" VerticalOptions="Fill" Color="{AppThemeBinding Light={DynamicResource SeparatorColorLight}, Dark={DynamicResource SeparatorColorDark}}" IsVisible="{OnPlatform Android=False, iOS=False}" />
                     <!-- My Investments -->
-                    <Grid Grid.Column="{OnPlatform WinUI='4',MacCatalyst='4'}" ColumnDefinitions="*" Grid.Row="{OnPlatform Android='2', iOS='2'}" HeightRequest="{OnPlatform WinUI= {Binding InvestmentsLayoutHeight},MacCatalyst = {Binding InvestmentsLayoutHeight}}" VerticalOptions="Start" HorizontalOptions="FillAndExpand" Margin="{OnPlatform Android='0,32,0,0'}">                        
+                    <Grid Grid.Column="{OnPlatform WinUI='4',MacCatalyst='4'}" ColumnDefinitions="*" Grid.Row="{OnPlatform Android='2', iOS='2'}" HeightRequest="{OnPlatform WinUI= {Binding InvestmentsLayoutHeight},MacCatalyst = {Binding InvestmentsLayoutHeight}}" VerticalOptions="Start" HorizontalOptions="Fill" Margin="{OnPlatform Android='0,32,0,0'}">                        
                         <Grid RowDefinitions="Auto,*">
                             <VerticalStackLayout Grid.Row="0" HeightRequest="{OnPlatform WinUI=28,MacCatalyst=28}" VerticalOptions="Start" HorizontalOptions="Start" Margin="{OnPlatform WinUI='16,16,0,0',MacCatalyst='16,16,0,0'}" IsVisible="{OnPlatform Android=False, iOS=False}">
                                 <Label Text="My&#160;Investments" FontSize="{OnPlatform WinUI=22,MacCatalyst=22}" FontFamily="{OnPlatform WinUI=Roboto-Medium,MacCatalyst=Roboto-Medium}"/>
                             </VerticalStackLayout>
                             <ScrollView Grid.Row="1" Margin="{OnPlatform WinUI='0,8,10,0',MacCatalyst='0,8,10,0', Android='0,16,10,0', iOS='0,16,10,0'}" >
-                                <VerticalStackLayout HorizontalOptions="FillAndExpand">
+                                <VerticalStackLayout HorizontalOptions="Fill">
                                     <CollectionView ItemsSource="{Binding Items}" VerticalScrollBarVisibility="{OnPlatform Android=Always, iOS=Always}">
                                         <CollectionView.ItemTemplate>
                                             <DataTemplate>
                                                 <VerticalStackLayout Margin="{OnPlatform WinUI='0,20,0,0',MacCatalyst='0,20,0,0'}">
-                                                    <Border Stroke="{Binding FrameColor}" StrokeThickness="1" Padding="10"  WidthRequest="{OnPlatform Android=344, iOS=344}" HeightRequest="{OnPlatform WinUI=72,MacCatalyst=72}" Background="{Binding FrameColor}" Margin="{OnPlatform WinUI='16,12,24,0',MacCatalyst='16,12,24,0', Android='16,12,16,0', iOS='16,12,24,0'}">
+                                                    <Border x:DataType="local:Stock" Stroke="{Binding FrameColor}" StrokeThickness="1" Padding="10"  WidthRequest="{OnPlatform Android=344, iOS=344}" HeightRequest="{OnPlatform WinUI=72,MacCatalyst=72}" Background="{Binding FrameColor}" Margin="{OnPlatform WinUI='16,12,24,0',MacCatalyst='16,12,24,0', Android='16,12,16,0', iOS='16,12,24,0'}">
                                                         <Border.StrokeShape>
                                                             <RoundRectangle CornerRadius="8"/>
                                                         </Border.StrokeShape>