diff --git a/Wino.Mail/Views/MailListPage.xaml b/Wino.Mail/Views/MailListPage.xaml
index 91328aa4..1cad33f7 100644
--- a/Wino.Mail/Views/MailListPage.xaml
+++ b/Wino.Mail/Views/MailListPage.xaml
@@ -403,10 +403,7 @@
 
     <Grid x:Name="RootGrid">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition
-                x:Name="ReaderColumn"
-                Width="*"
-                MaxWidth="{x:Bind ViewModel.StatePersistanceService.MailListPaneLength, Mode=OneWay}" />
+            <ColumnDefinition x:Name="ReaderColumn" Width="*" MaxWidth="{x:Bind ViewModel.StatePersistanceService.MailListPaneLength, Mode=OneWay}"/>
             <ColumnDefinition x:Name="RendererColumn" Width="*" />
         </Grid.ColumnDefinitions>
 
@@ -437,147 +434,160 @@
                 <!--  Top Commands  -->
                 <Grid
                     Grid.Row="0"
-                    Padding="4"
+                    Padding="2,0"
                     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
                     CornerRadius="8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="48" />
+                        <RowDefinition Height="2" />
+                    </Grid.RowDefinitions>
+
                     <!--  Commands  -->
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
 
-                    <Button
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        Command="{x:Bind ViewModel.SyncFolderCommand}"
-                        IsEnabled="{x:Bind ViewModel.CanSynchronize, Mode=OneWay}">
-                        <Button.Content>
-                            <controls:WinoFontIcon Icon="Sync" FontSize="16" />
-                        </Button.Content>
-                    </Button>
+                        <Button
+                            Style="{StaticResource TopCommandBarButtonStyle}"
+                            Command="{x:Bind ViewModel.SyncFolderCommand}"
+                            IsEnabled="{x:Bind ViewModel.CanSynchronize, Mode=OneWay}">
+                            <Button.Content>
+                                <controls:WinoFontIcon Icon="Sync" FontSize="16" />
+                            </Button.Content>
+                        </Button>
 
-                    <ToggleButton
-                        x:Name="SelectionModeToggle"
-                        Grid.Column="1"
-                        Style="{StaticResource TopCommandBarToggleButtonStyle}"
-                        Checked="SelectionModeToggleChecked"
-                        Unchecked="SelectionModeToggleUnchecked">
-                        <ToggleButton.Content>
-                            <controls:WinoFontIcon FontSize="18" Icon="MultiSelect" />
-                        </ToggleButton.Content>
-                    </ToggleButton>
+                        <ToggleButton
+                            x:Name="SelectionModeToggle"
+                            Grid.Column="1"
+                            Style="{StaticResource TopCommandBarToggleButtonStyle}"
+                            Checked="SelectionModeToggleChecked"
+                            Unchecked="SelectionModeToggleUnchecked">
+                            <ToggleButton.Content>
+                                <controls:WinoFontIcon FontSize="18" Icon="MultiSelect" />
+                            </ToggleButton.Content>
+                        </ToggleButton>
 
-                    <AppBarSeparator Grid.Column="2" Margin="2,0" />
+                        <AppBarSeparator Grid.Column="2" Margin="2,0" />
 
-                    <Button
-                        x:Name="ArchiveAppBarButton"
-                        Grid.Column="3"
-                        x:Load="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(ViewModel.IsArchiveSpecialFolder), Mode=OneWay}"
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        Command="{x:Bind ViewModel.MailOperationCommand}"
-                        IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
-                        ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Archive}">
-                        <Button.Content>
-                            <controls:WinoFontIcon FontSize="18" Icon="Archive" />
-                        </Button.Content>
-                        <Button.CommandParameter>
-                            <enums:MailOperation>Archive</enums:MailOperation>
-                        </Button.CommandParameter>
-                    </Button>
+                        <Button
+                            x:Name="ArchiveAppBarButton"
+                            Grid.Column="3"
+                            x:Load="{x:Bind helpers:XamlHelpers.ReverseBoolConverter(ViewModel.IsArchiveSpecialFolder), Mode=OneWay}"
+                            Style="{StaticResource TopCommandBarButtonStyle}"
+                            Command="{x:Bind ViewModel.MailOperationCommand}"
+                            IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Archive}">
+                            <Button.Content>
+                                <controls:WinoFontIcon FontSize="18" Icon="Archive" />
+                            </Button.Content>
+                            <Button.CommandParameter>
+                                <enums:MailOperation>Archive</enums:MailOperation>
+                            </Button.CommandParameter>
+                        </Button>
 
-                    <Button
-                        x:Name="UnarchiveAppBarButton"
-                        Grid.Column="3"
-                        x:Load="{x:Bind ViewModel.IsArchiveSpecialFolder, Mode=OneWay}"
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        Command="{x:Bind ViewModel.MailOperationCommand}"
-                        IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
-                        ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Unarchive}">
-                        <Button.Content>
-                            <controls:WinoFontIcon FontSize="18" Icon="UnArchive" />
-                        </Button.Content>
-                        <Button.CommandParameter>
-                            <enums:MailOperation>UnArchive</enums:MailOperation>
-                        </Button.CommandParameter>
-                    </Button>
+                        <Button
+                            x:Name="UnarchiveAppBarButton"
+                            Grid.Column="3"
+                            x:Load="{x:Bind ViewModel.IsArchiveSpecialFolder, Mode=OneWay}"
+                            Style="{StaticResource TopCommandBarButtonStyle}"
+                            Command="{x:Bind ViewModel.MailOperationCommand}"
+                            IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Unarchive}">
+                            <Button.Content>
+                                <controls:WinoFontIcon FontSize="18" Icon="UnArchive" />
+                            </Button.Content>
+                            <Button.CommandParameter>
+                                <enums:MailOperation>UnArchive</enums:MailOperation>
+                            </Button.CommandParameter>
+                        </Button>
 
-                    <Button
-                        Grid.Column="4"
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        Command="{x:Bind ViewModel.MailOperationCommand}"
-                        IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
-                        ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Delete}">
-                        <Button.CommandParameter>
-                            <enums:MailOperation>SoftDelete</enums:MailOperation>
-                        </Button.CommandParameter>
-                        <Button.Content>
-                            <controls:WinoFontIcon FontSize="18" Icon="Delete" />
-                        </Button.Content>
-                    </Button>
+                        <Button
+                            Grid.Column="4"
+                            Style="{StaticResource TopCommandBarButtonStyle}"
+                            Command="{x:Bind ViewModel.MailOperationCommand}"
+                            IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Delete}">
+                            <Button.CommandParameter>
+                                <enums:MailOperation>SoftDelete</enums:MailOperation>
+                            </Button.CommandParameter>
+                            <Button.Content>
+                                <controls:WinoFontIcon FontSize="18" Icon="Delete" />
+                            </Button.Content>
+                        </Button>
 
-                    <Button
-                        x:Name="MoveButtonAppBarButton"
-                        Grid.Column="5"
-                        Command="{x:Bind ViewModel.MailOperationCommand}"
-                        IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Move}">
-                        <Button.CommandParameter>
-                            <enums:MailOperation>Move</enums:MailOperation>
-                        </Button.CommandParameter>
-                        <Button.Content>
-                            <controls:WinoFontIcon FontSize="18" Icon="Move" />
-                        </Button.Content>
-                    </Button>
+                        <Button
+                            x:Name="MoveButtonAppBarButton"
+                            Grid.Column="5"
+                            Command="{x:Bind ViewModel.MailOperationCommand}"
+                            IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}"
+                            Style="{StaticResource TopCommandBarButtonStyle}"
+                            ToolTipService.ToolTip="{x:Bind domain:Translator.MailOperation_Move}">
+                            <Button.CommandParameter>
+                                <enums:MailOperation>Move</enums:MailOperation>
+                            </Button.CommandParameter>
+                            <Button.Content>
+                                <controls:WinoFontIcon FontSize="18" Icon="Move" />
+                            </Button.Content>
+                        </Button>
 
-                    <Button
-                        Grid.Column="6"
-                        Style="{StaticResource TopCommandBarButtonStyle}"
-                        IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}">
-                        <Button.Content>
-                            <controls:WinoFontIcon FontSize="20" Icon="More" />
-                        </Button.Content>
-                        <Button.Flyout>
-                            <MenuFlyout AreOpenCloseAnimationsEnabled="False" Placement="BottomEdgeAlignedLeft">
-                                <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_SetFlag}">
-                                    <MenuFlyoutItem.CommandParameter>
-                                        <enums:MailOperation>SetFlag</enums:MailOperation>
-                                    </MenuFlyoutItem.CommandParameter>
-                                    <MenuFlyoutItem.Icon>
-                                        <controls:WinoFontIcon Icon="Flag" />
-                                    </MenuFlyoutItem.Icon>
-                                </MenuFlyoutItem>
-                                <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_ClearFlag}">
-                                    <MenuFlyoutItem.CommandParameter>
-                                        <enums:MailOperation>ClearFlag</enums:MailOperation>
-                                    </MenuFlyoutItem.CommandParameter>
-                                    <MenuFlyoutItem.Icon>
-                                        <controls:WinoFontIcon Icon="ClearFlag" />
-                                    </MenuFlyoutItem.Icon>
-                                </MenuFlyoutItem>
-                                <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsRead}">
-                                    <MenuFlyoutItem.CommandParameter>
-                                        <enums:MailOperation>MarkAsRead</enums:MailOperation>
-                                    </MenuFlyoutItem.CommandParameter>
-                                    <MenuFlyoutItem.Icon>
-                                        <controls:WinoFontIcon Icon="MarkRead" />
-                                    </MenuFlyoutItem.Icon>
-                                </MenuFlyoutItem>
-                                <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsUnread}">
-                                    <MenuFlyoutItem.CommandParameter>
-                                        <enums:MailOperation>MarkAsUnread</enums:MailOperation>
-                                    </MenuFlyoutItem.CommandParameter>
-                                    <MenuFlyoutItem.Icon>
-                                        <controls:WinoFontIcon Icon="MarkUnread" />
-                                    </MenuFlyoutItem.Icon>
-                                </MenuFlyoutItem>
-                            </MenuFlyout>
-                        </Button.Flyout>
-                    </Button>
+                        <Button
+                            Grid.Column="6"
+                            Style="{StaticResource TopCommandBarButtonStyle}"
+                            IsEnabled="{x:Bind ViewModel.HasSelectedItems, Mode=OneWay}">
+                            <Button.Content>
+                                <controls:WinoFontIcon FontSize="20" Icon="More" />
+                            </Button.Content>
+                            <Button.Flyout>
+                                <MenuFlyout AreOpenCloseAnimationsEnabled="False" Placement="BottomEdgeAlignedLeft">
+                                    <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_SetFlag}">
+                                        <MenuFlyoutItem.CommandParameter>
+                                            <enums:MailOperation>SetFlag</enums:MailOperation>
+                                        </MenuFlyoutItem.CommandParameter>
+                                        <MenuFlyoutItem.Icon>
+                                            <controls:WinoFontIcon Icon="Flag" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                    <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_ClearFlag}">
+                                        <MenuFlyoutItem.CommandParameter>
+                                            <enums:MailOperation>ClearFlag</enums:MailOperation>
+                                        </MenuFlyoutItem.CommandParameter>
+                                        <MenuFlyoutItem.Icon>
+                                            <controls:WinoFontIcon Icon="ClearFlag" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                    <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsRead}">
+                                        <MenuFlyoutItem.CommandParameter>
+                                            <enums:MailOperation>MarkAsRead</enums:MailOperation>
+                                        </MenuFlyoutItem.CommandParameter>
+                                        <MenuFlyoutItem.Icon>
+                                            <controls:WinoFontIcon Icon="MarkRead" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                    <MenuFlyoutItem Command="{x:Bind ViewModel.MailOperationCommand}" Text="{x:Bind domain:Translator.MailOperation_MarkAsUnread}">
+                                        <MenuFlyoutItem.CommandParameter>
+                                            <enums:MailOperation>MarkAsUnread</enums:MailOperation>
+                                        </MenuFlyoutItem.CommandParameter>
+                                        <MenuFlyoutItem.Icon>
+                                            <controls:WinoFontIcon Icon="MarkUnread" />
+                                        </MenuFlyoutItem.Icon>
+                                    </MenuFlyoutItem>
+                                </MenuFlyout>
+                            </Button.Flyout>
+                        </Button>
+                    </Grid>
+
+                    <muxc:ProgressBar
+                        x:Name="LoadingProgressBar"
+                        Grid.Row="1"
+                        IsIndeterminate="True"
+                        x:Load="{x:Bind ViewModel.IsInitializingFolder, Mode=OneWay}" />
                 </Grid>
 
                 <!--  Pivot + Sync + Multi Select  -->