diff --git a/src/FluentHub.App/Data/Items/NavigationBarModel.cs b/src/FluentHub.App/Data/Items/NavigationBarModel.cs
index e21899569..7c2acdd68 100644
--- a/src/FluentHub.App/Data/Items/NavigationBarModel.cs
+++ b/src/FluentHub.App/Data/Items/NavigationBarModel.cs
@@ -5,8 +5,8 @@ namespace FluentHub.App.Data.Items
 {
 	public class NavigationBarModel : ObservableObject
 	{
-		private ObservableCollection<NavigationBarItem>? _NavigationBarItems;
-		public ObservableCollection<NavigationBarItem>? NavigationBarItems
+		private ObservableCollection<NavigationBarItem> _NavigationBarItems = new();
+		public ObservableCollection<NavigationBarItem> NavigationBarItems
 		{
 			get => _NavigationBarItems;
 			set => SetProperty(ref _NavigationBarItems, value);
diff --git a/src/FluentHub.App/Data/Items/NavigationHistory.cs b/src/FluentHub.App/Data/Items/NavigationHistory.cs
index 60f12f757..f46cf5903 100644
--- a/src/FluentHub.App/Data/Items/NavigationHistory.cs
+++ b/src/FluentHub.App/Data/Items/NavigationHistory.cs
@@ -175,9 +175,6 @@ private void UpdateNavigationBar(bool isBackNavigation = false)
 			{
 				currentTabNavigationBar.PageKind = CurrentItem.PageKind;
 
-				// Initialize NavigationBar items
-				currentTabNavigationBar.NavigationBarItems ??= new();
-
 				if (currentTabNavigationBar.NavigationBarItems.Count != 0)
 					currentTabNavigationBar.NavigationBarItems.Clear();
 
diff --git a/src/FluentHub.App/Data/Items/TabViewItem.cs b/src/FluentHub.App/Data/Items/TabViewItem.cs
index 86ed1c0f4..d05dad1bc 100644
--- a/src/FluentHub.App/Data/Items/TabViewItem.cs
+++ b/src/FluentHub.App/Data/Items/TabViewItem.cs
@@ -29,6 +29,7 @@ public TabViewItem()
 			Frame = new();
 			NavigationHistory = new();
 			NavigationBar = new();
+			NavigationBar.NavigationBarItems = new();
 
 			Frame.Navigating += OnFrameNavigating;
 		}
diff --git a/src/FluentHub.App/UserControls/IssueCommentBlock.xaml b/src/FluentHub.App/UserControls/IssueCommentBlock.xaml
index a7434bd93..10a144114 100644
--- a/src/FluentHub.App/UserControls/IssueCommentBlock.xaml
+++ b/src/FluentHub.App/UserControls/IssueCommentBlock.xaml
@@ -20,7 +20,7 @@
 		Background="{ThemeResource LayerFillColorDefaultBrush}"
 		BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
 		BorderThickness="1"
-		CornerRadius="{StaticResource ControlCornerRadius}">
+		CornerRadius="8">
 
 		<Grid.RowDefinitions>
 			<RowDefinition Height="Auto" />
@@ -62,9 +62,10 @@
 				<Button
 					Width="36"
 					Height="32"
+					Padding="0"
 					VerticalAlignment="Center"
 					Background="Transparent"
-					BorderThickness="0">
+					BorderBrush="Transparent">
 					<FontIcon FontSize="16" Glyph="&#xE10C;" />
 					<Button.Flyout>
 						<MenuFlyout Placement="BottomEdgeAlignedRight">
diff --git a/src/FluentHub.App/UserControls/Overview/PullRequestOverview.xaml b/src/FluentHub.App/UserControls/Overview/PullRequestOverview.xaml
index 8f8704fa1..76060b9ab 100644
--- a/src/FluentHub.App/UserControls/Overview/PullRequestOverview.xaml
+++ b/src/FluentHub.App/UserControls/Overview/PullRequestOverview.xaml
@@ -34,17 +34,24 @@
 			<RowDefinition Height="Auto" />
 		</Grid.RowDefinitions>
 
-		<Grid Padding="32,16,32,12">
+		<Grid
+			Padding="24,12,24,24"
+			ColumnSpacing="12"
+			RowSpacing="12">
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto" />
 				<RowDefinition Height="Auto" />
 			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="*" />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
 
 			<TextBlock
 				x:Name="PullRequestTitleTextBlock"
 				IsTextSelectionEnabled="True"
 				Style="{StaticResource TitleTextBlockStyle}"
-				ToolTipService.ToolTip="{x:Bind PullRequestTitleTextBlock.Text, Mode=OneWay}">
+				ToolTipService.ToolTip="{x:Bind ViewModel.PullRequest.Title, Mode=OneWay}">
 				<Run FontWeight="SemiBold" Text="{x:Bind ViewModel.PullRequest.Title, Mode=OneWay}" />
 				<Run
 					FontWeight="Normal"
@@ -54,7 +61,6 @@
 
 			<StackPanel
 				Grid.Row="1"
-				Margin="0,12,0,0"
 				Orientation="Horizontal"
 				Spacing="16">
 
@@ -160,6 +166,7 @@
 
 			<Grid
 				Grid.RowSpan="2"
+				Grid.Column="1"
 				HorizontalAlignment="Right"
 				VerticalAlignment="Top">
 				<Button
@@ -189,7 +196,13 @@
 
 		</Grid>
 
-		<Grid Grid.Row="1" Margin="24,0">
+		<Grid
+			Grid.Row="1"
+			Margin="24,0"
+			Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+			BorderThickness="1"
+			CornerRadius="8">
 			<NavigationView
 				x:Name="PullRequestNavView"
 				IsBackButtonVisible="Collapsed"
diff --git a/src/FluentHub.App/Views/LocatablePage.cs b/src/FluentHub.App/Views/LocatablePage.cs
index d7f38d259..9948b6c31 100644
--- a/src/FluentHub.App/Views/LocatablePage.cs
+++ b/src/FluentHub.App/Views/LocatablePage.cs
@@ -37,12 +37,18 @@ public void CheckIfNavigationBarShouldBeChanged()
 			if (currentTabNavigationBar is null)
 				return;
 
+			if (_currentPageKind is NavigationPageKind.None)
+			{
+				currentTabNavigationBar.PageKind = _currentPageKind;
+				currentTabNavigationBar.NavigationBarItems = new();
+
+				return;
+			}
+
 			if (currentTabNavigationBar.PageKind != _currentPageKind)
 			{
 				currentTabNavigationBar.PageKind = _currentPageKind;
 
-				// Initialize NavigationBar items
-				currentTabNavigationBar.NavigationBarItems ??= new();
 				currentTabNavigationBar.NavigationBarItems.Clear();
 
 				// Generate items
diff --git a/src/FluentHub.App/Views/MainPage.xaml b/src/FluentHub.App/Views/MainPage.xaml
index ec5ea50c8..778a15e88 100644
--- a/src/FluentHub.App/Views/MainPage.xaml
+++ b/src/FluentHub.App/Views/MainPage.xaml
@@ -118,6 +118,8 @@
 				Grid.Row="0"
 				Padding="16,12,16,12"
 				Background="{ThemeResource AppThemeGlobalNavigationBarBackgroundBrush}"
+				BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
+				BorderThickness="0,0,0,1"
 				RowSpacing="12">
 				<Grid>
 					<Grid.RowDefinitions>
diff --git a/src/FluentHub.App/Views/Repositories/Code/DetailsLayoutView.xaml b/src/FluentHub.App/Views/Repositories/Code/DetailsLayoutView.xaml
index 4c59c6498..5d1f087a5 100644
--- a/src/FluentHub.App/Views/Repositories/Code/DetailsLayoutView.xaml
+++ b/src/FluentHub.App/Views/Repositories/Code/DetailsLayoutView.xaml
@@ -25,7 +25,7 @@
 	<Grid>
 		<Grid x:Name="RootContentGrid" x:Load="{x:Bind ViewModel.LoadDetailsViewPageCommand.ExecutionTask.IsFaulted, Converter={StaticResource ObjectToBoolConverter}, ConverterParameter=Invert, Mode=OneWay}">
 			<ScrollViewer>
-				<Grid Padding="32,24" RowSpacing="8">
+				<Grid Padding="24,24" RowSpacing="8">
 					<Grid.RowDefinitions>
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="*" />
diff --git a/src/FluentHub.App/Views/Repositories/Commits/CommitsPage.xaml b/src/FluentHub.App/Views/Repositories/Commits/CommitsPage.xaml
index 0e7547771..2cb4d408f 100644
--- a/src/FluentHub.App/Views/Repositories/Commits/CommitsPage.xaml
+++ b/src/FluentHub.App/Views/Repositories/Commits/CommitsPage.xaml
@@ -24,21 +24,39 @@
 
 		<Grid x:Name="RootContentGrid" x:Load="{x:Bind ViewModel.LoadRepositoryCommitsPageCommand.ExecutionTask.IsFaulted, Converter={StaticResource ObjectToBoolConverter}, ConverterParameter=Invert, Mode=OneWay}">
 			<ScrollViewer VerticalScrollBarVisibility="Auto">
-				<Grid Margin="0,0,8,8" RowSpacing="8">
+				<Grid Padding="24,24" RowSpacing="12">
 					<Grid.RowDefinitions>
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="*" />
 					</Grid.RowDefinitions>
 
-					<ov:RepositoryOverview ViewModel="{x:Bind ViewModel.RepositoryOverviewViewModel, Mode=OneWay}" />
+					<Grid>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="Auto" />
+							<ColumnDefinition Width="*" />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
+
+						<StackPanel Orientation="Horizontal" Spacing="8">
+							<!--<primer:Avatar
+								Width="32"
+								Height="32"
+								IsSquare="True"
+								Source="{x:Bind ViewModel.Repository.Owner.AvatarUrl, Mode=OneWay}" />-->
+
+							<TextBlock
+								VerticalAlignment="Center"
+								Style="{StaticResource SubtitleTextBlockStyle}"
+								Text="Commits on" />
+
+							<TextBlock
+								VerticalAlignment="Center"
+								Style="{StaticResource SubtitleTextBlockStyle}"
+								Text="{x:Bind ViewModel.Repository.Name, Mode=OneWay}" />
+						</StackPanel>
+					</Grid>
 
-					<Grid
-						Grid.Row="1"
-						Padding="32,24"
-						Background="{ThemeResource LayerFillColorDefaultBrush}"
-						BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-						BorderThickness="1"
-						CornerRadius="8">
+					<Grid Grid.Row="1">
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="*" />
@@ -47,7 +65,7 @@
 						<ScrollViewer Grid.Row="2">
 							<ItemsRepeater ItemsSource="{x:Bind ViewModel.Items, Mode=OneWay}">
 								<ItemsRepeater.Layout>
-									<StackLayout Orientation="Vertical" Spacing="6" />
+									<StackLayout Orientation="Vertical" Spacing="4" />
 								</ItemsRepeater.Layout>
 								<DataTemplate x:DataType="bbvm:CommitBlockButtonViewModel">
 									<bb:CommitBlockButton ViewModel="{x:Bind}" />
diff --git a/src/FluentHub.App/Views/Repositories/Issues/IssuePage.xaml b/src/FluentHub.App/Views/Repositories/Issues/IssuePage.xaml
index 030705e4c..f3df2e713 100644
--- a/src/FluentHub.App/Views/Repositories/Issues/IssuePage.xaml
+++ b/src/FluentHub.App/Views/Repositories/Issues/IssuePage.xaml
@@ -54,7 +54,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -92,7 +92,6 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -132,7 +131,7 @@
 										<TextBlock
 											Grid.Column="2"
 											Foreground="{ThemeResource TextFillColorSecondary}"
-											Style="{StaticResource BodyTextBlockStyle}"
+											Style="{StaticResource CaptionTextBlockStyle}"
 											Text="{x:Bind CreatedAtHumanized}" />
 									</Grid>
 								</primer:Timeline.Body>
@@ -172,7 +171,7 @@
 										<TextBlock
 											Grid.Column="2"
 											Foreground="{ThemeResource TextFillColorSecondary}"
-											Style="{StaticResource BodyTextBlockStyle}"
+											Style="{StaticResource CaptionTextBlockStyle}"
 											Text="{x:Bind CreatedAtHumanized}" />
 									</Grid>
 								</primer:Timeline.Body>
@@ -216,7 +215,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -257,7 +256,7 @@
 							<StackPanel Grid.Column="2" HorizontalAlignment="Right">
 								<TextBlock
 									Foreground="{ThemeResource TextFillColorSecondary}"
-									Style="{StaticResource BodyTextBlockStyle}"
+									Style="{StaticResource CaptionTextBlockStyle}"
 									Text="{x:Bind CreatedAtHumanized}" />
 							</StackPanel>
 						</Grid>
@@ -297,7 +296,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -334,7 +333,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -403,7 +402,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 							<uc:ReferencedSubjectButton
 								Grid.Row="1"
@@ -446,7 +445,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -487,7 +486,7 @@
 							<StackPanel Grid.Column="2" HorizontalAlignment="Right">
 								<TextBlock
 									Foreground="{ThemeResource TextFillColorSecondary}"
-									Style="{StaticResource BodyTextBlockStyle}"
+									Style="{StaticResource CaptionTextBlockStyle}"
 									Text="{x:Bind CreatedAtHumanized}" />
 							</StackPanel>
 						</Grid>
@@ -556,7 +555,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -603,7 +602,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -658,7 +657,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -693,8 +692,7 @@
                             <TextBlock
                                 Grid.Column="2"
                                 Foreground="{ThemeResource TextFillColorSecondary}"
-                                Style="{StaticResource BodyTextBlockStyle}"
-                                Text="{x:Bind CreatedAtHumanized}" />
+                                Style="{StaticResource CaptionTextBlockStyle}" Text="{x:Bind CreatedAtHumanized}" />
                         </Grid>
                     </primer:Timeline.Body>
                 </primer:Timeline>
@@ -731,7 +729,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -768,7 +766,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -805,7 +803,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -845,7 +843,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -882,7 +880,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -923,7 +921,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -964,7 +962,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -999,8 +997,7 @@
                             <TextBlock
                                 Grid.Column="2"
                                 Foreground="{ThemeResource TextFillColorSecondary}"
-                                Style="{StaticResource BodyTextBlockStyle}"
-                                Text="{x:Bind CreatedAtHumanized}" />
+                                Style="{StaticResource CaptionTextBlockStyle}" Text="{x:Bind CreatedAtHumanized}" />
                         </Grid>
                     </primer:Timeline.Body>
                 </primer:Timeline>
@@ -1054,7 +1051,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1096,7 +1093,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1144,7 +1141,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1182,7 +1179,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1237,7 +1234,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1274,7 +1271,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1311,7 +1308,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1355,7 +1352,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1418,20 +1415,26 @@
 						<RowDefinition Height="Auto" />
 					</Grid.RowDefinitions>
 
+					<!--  Overview  -->
 					<Grid
-						Grid.Row="1"
-						Margin="0,8,0,0"
-						Padding="32,24">
+						Grid.Row="0"
+						Padding="24,12,24,12"
+						ColumnSpacing="12"
+						RowSpacing="12">
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="Auto" />
 						</Grid.RowDefinitions>
+						<Grid.ColumnDefinitions>
+							<ColumnDefinition Width="*" />
+							<ColumnDefinition Width="Auto" />
+						</Grid.ColumnDefinitions>
 
 						<TextBlock
 							x:Name="IssueTitleTextBlock"
 							IsTextSelectionEnabled="True"
 							Style="{StaticResource TitleTextBlockStyle}"
-							ToolTipService.ToolTip="{x:Bind IssueTitleTextBlock.Text, Mode=OneWay}">
+							ToolTipService.ToolTip="{x:Bind ViewModel.IssueItem.Title, Mode=OneWay}">
 							<Run FontWeight="SemiBold" Text="{x:Bind ViewModel.IssueItem.Title, Mode=OneWay}" />
 							<Run
 								FontWeight="Normal"
@@ -1441,7 +1444,6 @@
 
 						<StackPanel
 							Grid.Row="1"
-							Margin="0,12,0,0"
 							Orientation="Horizontal"
 							Spacing="8">
 							<toolkit:SwitchPresenter TargetType="x:Boolean" Value="{x:Bind ViewModel.IssueItem.Closed, Mode=OneWay}">
@@ -1456,6 +1458,7 @@
 
 						<Grid
 							Grid.RowSpan="2"
+							Grid.Column="1"
 							HorizontalAlignment="Right"
 							VerticalAlignment="Top">
 							<Button
@@ -1484,10 +1487,13 @@
 
 					</Grid>
 
-					<Grid
-						Grid.Row="2"
-						Margin="0,8,0,0"
-						Padding="32,0,32,32">
+					<Rectangle
+						Grid.Row="1"
+						Height="1"
+						Margin="24,0"
+						Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
+
+					<Grid Grid.Row="2" Padding="24,0,24,0">
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="3*" />
 							<ColumnDefinition
@@ -1522,7 +1528,7 @@
 						<StackPanel
 							x:Name="IssueDetailsSidebar"
 							Grid.Column="1"
-							Margin="24,32,0,0"
+							Margin="16,32,0,0"
 							Spacing="12">
 
 							<StackPanel Spacing="12">
@@ -1743,7 +1749,13 @@
 
 					</Grid>
 
-					<Grid Grid.Row="3" Margin="0,8,0,0">
+					<Grid
+						Grid.Row="3"
+						Margin="24,0,24,24"
+						Background="{ThemeResource LayerFillColorDefaultBrush}"
+						BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+						BorderThickness="1"
+						CornerRadius="8">
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="Auto" />
@@ -1764,65 +1776,70 @@
 										IsSelected="True" />
 									<NavigationViewItem Content="Preview" IsEnabled="False" />
 								</NavigationView.MenuItems>
-								<!--<NavigationView.PaneFooter>
-                                    <StackPanel Orientation="Horizontal" Spacing="4">
-                                        <Button
-                                            Width="32"
-                                            Height="32"
-                                            Padding="0"
-                                            Background="Transparent"
-                                            BorderThickness="0">
-                                            <FontIcon
-                                                FontFamily="{StaticResource Octicons}"
-                                                FontSize="14"
-                                                Glyph="&#xE9CD;" />
-                                        </Button>
-                                        <Button
-                                            Width="32"
-                                            Height="32"
-                                            Padding="0"
-                                            Background="Transparent"
-                                            BorderThickness="0">
-                                            <FontIcon
-                                                FontFamily="{StaticResource Octicons}"
-                                                FontSize="14"
-                                                Glyph="&#xEAA7;" />
-                                        </Button>
-                                        <Button
-                                            Width="32"
-                                            Height="32"
-                                            Padding="0"
-                                            Background="Transparent"
-                                            BorderThickness="0">
-                                            <FontIcon
-                                                FontFamily="{StaticResource Octicons}"
-                                                FontSize="14"
-                                                Glyph="&#xEA0F;" />
-                                        </Button>
-                                        <Button
-                                            Width="32"
-                                            Height="32"
-                                            Padding="0"
-                                            Background="Transparent"
-                                            BorderThickness="0">
-                                            <FontIcon
-                                                FontFamily="{StaticResource Octicons}"
-                                                FontSize="14"
-                                                Glyph="&#xE968;" />
-                                        </Button>
-                                        <Button
-                                            Width="32"
-                                            Height="32"
-                                            Padding="0"
-                                            Background="Transparent"
-                                            BorderThickness="0">
-                                            <FontIcon
-                                                FontFamily="{StaticResource Octicons}"
-                                                FontSize="14"
-                                                Glyph="&#xEA50;" />
-                                        </Button>
-                                    </StackPanel>
-                                </NavigationView.PaneFooter>-->
+								<NavigationView.PaneFooter>
+									<StackPanel Orientation="Horizontal" Spacing="4">
+										<Button
+											Width="32"
+											Height="32"
+											Padding="0"
+											Background="Transparent"
+											BorderThickness="0"
+											IsEnabled="False">
+											<FontIcon
+												FontFamily="{StaticResource Octicons}"
+												FontSize="14"
+												Glyph="&#xE9CD;" />
+										</Button>
+										<Button
+											Width="32"
+											Height="32"
+											Padding="0"
+											Background="Transparent"
+											BorderThickness="0"
+											IsEnabled="False">
+											<FontIcon
+												FontFamily="{StaticResource Octicons}"
+												FontSize="14"
+												Glyph="&#xEAA7;" />
+										</Button>
+										<Button
+											Width="32"
+											Height="32"
+											Padding="0"
+											Background="Transparent"
+											BorderThickness="0"
+											IsEnabled="False">
+											<FontIcon
+												FontFamily="{StaticResource Octicons}"
+												FontSize="14"
+												Glyph="&#xEA0F;" />
+										</Button>
+										<Button
+											Width="32"
+											Height="32"
+											Padding="0"
+											Background="Transparent"
+											BorderThickness="0"
+											IsEnabled="False">
+											<FontIcon
+												FontFamily="{StaticResource Octicons}"
+												FontSize="14"
+												Glyph="&#xE968;" />
+										</Button>
+										<Button
+											Width="32"
+											Height="32"
+											Padding="0"
+											Background="Transparent"
+											BorderThickness="0"
+											IsEnabled="False">
+											<FontIcon
+												FontFamily="{StaticResource Octicons}"
+												FontSize="14"
+												Glyph="&#xEA50;" />
+										</Button>
+									</StackPanel>
+								</NavigationView.PaneFooter>
 							</NavigationView>
 						</Grid>
 
@@ -1835,7 +1852,6 @@
 							<TextBox
 								Margin="12"
 								Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-								IsEnabled="False"
 								PlaceholderText="Leave a comment" />
 						</Grid>
 
diff --git a/src/FluentHub.App/Views/Repositories/Issues/IssuesPage.xaml b/src/FluentHub.App/Views/Repositories/Issues/IssuesPage.xaml
index 31931d94f..34e8c27ad 100644
--- a/src/FluentHub.App/Views/Repositories/Issues/IssuesPage.xaml
+++ b/src/FluentHub.App/Views/Repositories/Issues/IssuesPage.xaml
@@ -86,7 +86,7 @@
 						</Grid>
 					</Grid>
 
-					<Grid Grid.Row="2" Padding="32,24">
+					<Grid Grid.Row="2" Padding="24,12,24,24">
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="*" />
diff --git a/src/FluentHub.App/Views/Repositories/PullRequests/ChecksPage.xaml b/src/FluentHub.App/Views/Repositories/PullRequests/ChecksPage.xaml
index a147ed7a3..2e094bc60 100644
--- a/src/FluentHub.App/Views/Repositories/PullRequests/ChecksPage.xaml
+++ b/src/FluentHub.App/Views/Repositories/PullRequests/ChecksPage.xaml
@@ -53,7 +53,7 @@
 
 					<ov:PullRequestOverview Grid.Row="1" ViewModel="{x:Bind ViewModel.PullRequestOverviewViewModel, Mode=OneWay}" />
 
-					<Grid Grid.Row="2" ColumnSpacing="8">
+					<Grid Padding="24,0,24,24" Grid.Row="2" ColumnSpacing="8">
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="Auto" MaxWidth="360" />
 							<ColumnDefinition Width="*" />
diff --git a/src/FluentHub.App/Views/Repositories/PullRequests/CommitPage.xaml b/src/FluentHub.App/Views/Repositories/PullRequests/CommitPage.xaml
index 5a08a86a7..edc5417da 100644
--- a/src/FluentHub.App/Views/Repositories/PullRequests/CommitPage.xaml
+++ b/src/FluentHub.App/Views/Repositories/PullRequests/CommitPage.xaml
@@ -33,7 +33,7 @@
 
 					<ov:PullRequestOverview Grid.Row="1" ViewModel="{x:Bind ViewModel.PullRequestOverviewViewModel, Mode=OneWay}" />
 
-					<Grid Grid.Row="2" Padding="32">
+					<Grid Grid.Row="2" Padding="24,12,24,24">
 						<ScrollViewer VerticalScrollBarVisibility="Auto">
 							<ItemsRepeater ItemsSource="{x:Bind ViewModel.DiffViewModels, Mode=OneWay}">
 								<ItemsRepeater.Layout>
diff --git a/src/FluentHub.App/Views/Repositories/PullRequests/CommitsPage.xaml b/src/FluentHub.App/Views/Repositories/PullRequests/CommitsPage.xaml
index c0226d407..0f2c24296 100644
--- a/src/FluentHub.App/Views/Repositories/PullRequests/CommitsPage.xaml
+++ b/src/FluentHub.App/Views/Repositories/PullRequests/CommitsPage.xaml
@@ -34,7 +34,7 @@
 
 					<ov:PullRequestOverview Grid.Row="1" ViewModel="{x:Bind ViewModel.PullRequestOverviewViewModel, Mode=OneWay}" />
 
-					<Grid Grid.Row="2" Padding="32,24">
+					<Grid Grid.Row="2" Padding="24,12,24,24">
 						<ItemsRepeater ItemsSource="{x:Bind ViewModel.Items, Mode=OneWay}">
 							<ItemsRepeater.Layout>
 								<StackLayout Orientation="Vertical" Spacing="6" />
diff --git a/src/FluentHub.App/Views/Repositories/PullRequests/ConversationPage.xaml b/src/FluentHub.App/Views/Repositories/PullRequests/ConversationPage.xaml
index 0141281fa..a68cc6997 100644
--- a/src/FluentHub.App/Views/Repositories/PullRequests/ConversationPage.xaml
+++ b/src/FluentHub.App/Views/Repositories/PullRequests/ConversationPage.xaml
@@ -54,7 +54,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -92,7 +92,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -132,7 +132,7 @@
 										<TextBlock
 											Grid.Column="2"
 											Foreground="{ThemeResource TextFillColorSecondary}"
-											Style="{StaticResource BodyTextBlockStyle}"
+											Style="{StaticResource CaptionTextBlockStyle}"
 											Text="{x:Bind CreatedAtHumanized}" />
 									</Grid>
 								</primer:Timeline.Body>
@@ -172,7 +172,7 @@
 										<TextBlock
 											Grid.Column="2"
 											Foreground="{ThemeResource TextFillColorSecondary}"
-											Style="{StaticResource BodyTextBlockStyle}"
+											Style="{StaticResource CaptionTextBlockStyle}"
 											Text="{x:Bind CreatedAtHumanized}" />
 									</Grid>
 								</primer:Timeline.Body>
@@ -216,7 +216,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -257,7 +257,7 @@
 							<StackPanel Grid.Column="2" HorizontalAlignment="Right">
 								<TextBlock
 									Foreground="{ThemeResource TextFillColorSecondary}"
-									Style="{StaticResource BodyTextBlockStyle}"
+									Style="{StaticResource CaptionTextBlockStyle}"
 									Text="{x:Bind CreatedAtHumanized}" />
 							</StackPanel>
 						</Grid>
@@ -297,7 +297,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -334,7 +334,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -406,7 +406,7 @@
 							<StackPanel Grid.Column="2" HorizontalAlignment="Right">
 								<TextBlock
 									Foreground="{ThemeResource TextFillColorSecondary}"
-									Style="{StaticResource BodyTextBlockStyle}"
+									Style="{StaticResource CaptionTextBlockStyle}"
 									Text="{x:Bind CreatedAtHumanized}" />
 							</StackPanel>
 							<Button
@@ -586,7 +586,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -627,7 +627,7 @@
 							<StackPanel Grid.Column="2" HorizontalAlignment="Right">
 								<TextBlock
 									Foreground="{ThemeResource TextFillColorSecondary}"
-									Style="{StaticResource BodyTextBlockStyle}"
+									Style="{StaticResource CaptionTextBlockStyle}"
 									Text="{x:Bind CreatedAtHumanized}" />
 							</StackPanel>
 						</Grid>
@@ -696,7 +696,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -743,7 +743,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -798,7 +798,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -833,8 +833,7 @@
                             <TextBlock
                                 Grid.Column="2"
                                 Foreground="{ThemeResource TextFillColorSecondary}"
-                                Style="{StaticResource BodyTextBlockStyle}"
-                                Text="{x:Bind CreatedAtHumanized}" />
+                                Style="{StaticResource CaptionTextBlockStyle}" Text="{x:Bind CreatedAtHumanized}" />
                         </Grid>
                     </primer:Timeline.Body>
                 </primer:Timeline>
@@ -871,7 +870,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -908,7 +907,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -945,7 +944,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -985,7 +984,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1022,7 +1021,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1063,7 +1062,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1104,7 +1103,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1139,8 +1138,7 @@
                             <TextBlock
                                 Grid.Column="2"
                                 Foreground="{ThemeResource TextFillColorSecondary}"
-                                Style="{StaticResource BodyTextBlockStyle}"
-                                Text="{x:Bind CreatedAtHumanized}" />
+                                Style="{StaticResource CaptionTextBlockStyle}" Text="{x:Bind CreatedAtHumanized}" />
                         </Grid>
                     </primer:Timeline.Body>
                 </primer:Timeline>
@@ -1194,7 +1192,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1236,7 +1234,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1284,7 +1282,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1322,7 +1320,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1377,7 +1375,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1414,7 +1412,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1451,7 +1449,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1495,7 +1493,7 @@
 							<TextBlock
 								Grid.Column="2"
 								Foreground="{ThemeResource TextFillColorSecondary}"
-								Style="{StaticResource BodyTextBlockStyle}"
+								Style="{StaticResource CaptionTextBlockStyle}"
 								Text="{x:Bind CreatedAtHumanized}" />
 						</Grid>
 					</primer:Timeline.Body>
@@ -1560,7 +1558,7 @@
 
 					<ov:PullRequestOverview Grid.Row="1" ViewModel="{x:Bind ViewModel.PullRequestOverviewViewModel, Mode=OneWay}" />
 
-					<Grid Grid.Row="2" Padding="32,0,32,32">
+					<Grid Grid.Row="2" Padding="24,0,24,0">
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="3*" />
 							<ColumnDefinition
@@ -1596,7 +1594,7 @@
 						<StackPanel
 							x:Name="PullRequestDetailsSidebar"
 							Grid.Column="1"
-							Margin="24,32,0,0"
+							Margin="16,32,0,0"
 							Spacing="12">
 
 							<StackPanel Spacing="12">
@@ -1865,6 +1863,7 @@
 
 					<Grid
 						Grid.Row="3"
+						Margin="24,0,24,24"
 						Background="{ThemeResource LayerFillColorDefaultBrush}"
 						BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
 						BorderThickness="1"
@@ -1897,7 +1896,8 @@
 											Height="32"
 											Padding="0"
 											Background="Transparent"
-											BorderThickness="0">
+											BorderThickness="0"
+											IsEnabled="False">
 											<FontIcon
 												FontFamily="{StaticResource Octicons}"
 												FontSize="14"
@@ -1908,7 +1908,8 @@
 											Height="32"
 											Padding="0"
 											Background="Transparent"
-											BorderThickness="0">
+											BorderThickness="0"
+											IsEnabled="False">
 											<FontIcon
 												FontFamily="{StaticResource Octicons}"
 												FontSize="14"
@@ -1919,7 +1920,8 @@
 											Height="32"
 											Padding="0"
 											Background="Transparent"
-											BorderThickness="0">
+											BorderThickness="0"
+											IsEnabled="False">
 											<FontIcon
 												FontFamily="{StaticResource Octicons}"
 												FontSize="14"
@@ -1930,7 +1932,8 @@
 											Height="32"
 											Padding="0"
 											Background="Transparent"
-											BorderThickness="0">
+											BorderThickness="0"
+											IsEnabled="False">
 											<FontIcon
 												FontFamily="{StaticResource Octicons}"
 												FontSize="14"
@@ -1941,7 +1944,8 @@
 											Height="32"
 											Padding="0"
 											Background="Transparent"
-											BorderThickness="0">
+											BorderThickness="0"
+											IsEnabled="False">
 											<FontIcon
 												FontFamily="{StaticResource Octicons}"
 												FontSize="14"
@@ -1962,7 +1966,6 @@
 							<TextBox
 								Margin="12"
 								Background="{ThemeResource LayerFillColorDefaultBrush}"
-								IsEnabled="False"
 								PlaceholderText="Leave a comment" />
 						</Grid>
 
diff --git a/src/FluentHub.App/Views/Repositories/PullRequests/FileChangesPage.xaml b/src/FluentHub.App/Views/Repositories/PullRequests/FileChangesPage.xaml
index 50416783d..1b97918a9 100644
--- a/src/FluentHub.App/Views/Repositories/PullRequests/FileChangesPage.xaml
+++ b/src/FluentHub.App/Views/Repositories/PullRequests/FileChangesPage.xaml
@@ -32,7 +32,7 @@
 
 					<ov:PullRequestOverview Grid.Row="1" ViewModel="{x:Bind ViewModel.PullRequestOverviewViewModel, Mode=OneWay}" />
 
-					<Grid Grid.Row="2" Padding="32,24">
+					<Grid Grid.Row="2" Padding="24,12,24,24">
 						<ItemsRepeater ItemsSource="{x:Bind ViewModel.DiffViewModels, Mode=OneWay}">
 							<ItemsRepeater.Layout>
 								<StackLayout Orientation="Vertical" Spacing="6" />
diff --git a/src/FluentHub.App/Views/Repositories/PullRequests/PullRequestsPage.xaml b/src/FluentHub.App/Views/Repositories/PullRequests/PullRequestsPage.xaml
index 3c1c2b978..220e950a6 100644
--- a/src/FluentHub.App/Views/Repositories/PullRequests/PullRequestsPage.xaml
+++ b/src/FluentHub.App/Views/Repositories/PullRequests/PullRequestsPage.xaml
@@ -25,16 +25,13 @@
 
 		<Grid x:Name="RootContentGrid" x:Load="{x:Bind ViewModel.LoadRepositoryPullRequestsPageCommand.ExecutionTask.IsFaulted, Converter={StaticResource ObjectToBoolConverter}, ConverterParameter=Invert, Mode=OneWay}">
 			<ScrollViewer VerticalScrollBarVisibility="Auto">
-				<Grid Grid.Row="1" Padding="32">
+				<Grid Padding="24,24,24,24">
 					<Grid.RowDefinitions>
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="*" />
 					</Grid.RowDefinitions>
 
-					<Grid
-						Grid.Row="0"
-						Margin="0,8,0,16"
-						RowSpacing="8">
+					<Grid Grid.Row="0" RowSpacing="8">
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="Auto" />
diff --git a/src/FluentHub.App/Views/Viewers/NotificationsPage.xaml.cs b/src/FluentHub.App/Views/Viewers/NotificationsPage.xaml.cs
index aefc5e6b4..c01ac6fcf 100644
--- a/src/FluentHub.App/Views/Viewers/NotificationsPage.xaml.cs
+++ b/src/FluentHub.App/Views/Viewers/NotificationsPage.xaml.cs
@@ -10,7 +10,7 @@ namespace FluentHub.App.Views.Viewers
 	public sealed partial class NotificationsPage : LocatablePage
 	{
 		public NotificationsPage()
-			: base(NavigationPageKind.None, NavigationPageKey.None)
+			:	base(NavigationPageKind.None, NavigationPageKey.None)
 		{
 			InitializeComponent();