diff --git a/README.md b/README.md
index 868cd499..9355d134 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,4 @@ Snap Hutao is an open-source Genshin Impact toolbox on Windows platform, aim to
 * [Snap.Metadata](https://github.com/DGP-Studio/Snap.Metadata)
 
 ## 开发 / Development
-![Snap.Hutao](https://repobeats.axiom.co/api/embed/f029553fbe0c60689b1710476ec8512452163fc9.svg)
-
-![Branch Rule](res/branch.png)
\ No newline at end of file
+![Snap.Hutao](https://repobeats.axiom.co/api/embed/f029553fbe0c60689b1710476ec8512452163fc9.svg)
\ No newline at end of file
diff --git a/res/branch.png b/res/branch.png
deleted file mode 100644
index b51fde50..00000000
Binary files a/res/branch.png and /dev/null differ
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Tower/TowerFloor.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Tower/TowerFloor.cs
index 4fc7f280..15f482d6 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Tower/TowerFloor.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Tower/TowerFloor.cs
@@ -29,4 +29,9 @@ internal sealed class TowerFloor
     /// 背景图片
     /// </summary>
     public string Background { get; set; } = default!;
+
+    /// <summary>
+    /// 描述
+    /// </summary>
+    public List<string> Descriptions { get; set; } = default!;
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
index ceeac1db..eb9444ef 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
@@ -23,25 +23,22 @@
         <shcb:InvokeCommandOnLoadedBehavior Command="{Binding OpenUICommand}"/>
     </mxi:Interaction.Behaviors>
     <shc:ScopedPage.Resources>
-        <x:Double x:Key="AdaptiveGridViewDesiredWidth">300</x:Double>
         <shc:BindingProxy x:Key="BindingProxy" DataContext="{Binding}"/>
 
         <DataTemplate x:Key="AnnouncementTemplate">
-            <ItemsView
-                Margin="16"
+            <ItemsRepeater
+                Margin="16,0,16,16"
                 HorizontalAlignment="Stretch"
-                IsItemInvokedEnabled="False"
-                ItemsSource="{Binding List}"
-                SelectionMode="None">
-                <ItemsView.Layout>
+                ItemsSource="{Binding List}">
+                <ItemsRepeater.Layout>
                     <UniformGridLayout
                         ItemsJustification="Start"
                         ItemsStretch="Fill"
                         MinColumnSpacing="12"
                         MinItemWidth="300"
                         MinRowSpacing="12"/>
-                </ItemsView.Layout>
-                <ItemsView.ItemTemplate>
+                </ItemsRepeater.Layout>
+                <ItemsRepeater.ItemTemplate>
                     <DataTemplate>
                         <ItemContainer>
                             <Border Style="{StaticResource BorderCardStyle}">
@@ -154,8 +151,8 @@
                             </Border>
                         </ItemContainer>
                     </DataTemplate>
-                </ItemsView.ItemTemplate>
-            </ItemsView>
+                </ItemsRepeater.ItemTemplate>
+            </ItemsRepeater>
         </DataTemplate>
     </shc:ScopedPage.Resources>
     <Grid>
@@ -194,34 +191,31 @@
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
-
-                    <ItemsView
+                    <ItemsRepeater
                         Margin="16"
                         HorizontalAlignment="Stretch"
-                        IsItemInvokedEnabled="False"
-                        ItemsSource="{Binding Cards, Mode=OneWay}"
-                        SelectionMode="None"
-                        Visibility="{Binding Cards.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
-                        <ItemsView.Layout>
+                        ItemsSource="{Binding Cards, Mode=OneWay}">
+                        <ItemsRepeater.Layout>
                             <UniformGridLayout
                                 ItemsJustification="Start"
                                 ItemsStretch="Fill"
                                 MinColumnSpacing="12"
                                 MinItemHeight="180"
                                 MinItemWidth="300"
-                                MinRowSpacing="12"/>
-                        </ItemsView.Layout>
-                        <ItemsView.ItemTemplate>
+                                MinRowSpacing="12"
+                                Orientation="Horizontal"/>
+                        </ItemsRepeater.Layout>
+                        <ItemsRepeater.ItemTemplate>
                             <DataTemplate>
-                                <ItemContainer>
+                                <ItemContainer Child="{Binding Card}">
                                     <ItemContainer.Resources>
                                         <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
                                     </ItemContainer.Resources>
-                                    <ContentControl HorizontalContentAlignment="Stretch" Content="{Binding Card}"/>
+                                    <!--<ContentPresenter HorizontalContentAlignment="Stretch" Content="{Binding Card}"/>-->
                                 </ItemContainer>
                             </DataTemplate>
-                        </ItemsView.ItemTemplate>
-                    </ItemsView>
+                        </ItemsRepeater.ItemTemplate>
+                    </ItemsRepeater>
                 </StackPanel>
 
                 <Pivot Style="{StaticResource DefaultPivotStyle}">
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
index e1c644d2..3784e7a8 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
@@ -84,198 +84,218 @@
                     <Grid>
                         <Pivot Visibility="{Binding CultivateEntries.Count, Converter={StaticResource Int32ToVisibilityConverter}}">
                             <PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationCultivateEntry}">
-                                <cwucont:AdaptiveGridView
-                                    Padding="16,16,4,4"
-                                    cwa:ItemsReorderAnimation.Duration="0:0:0.1"
-                                    DesiredWidth="320"
-                                    ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
+                                <ItemsView
+                                    Padding="16,0"
+                                    IsItemInvokedEnabled="False"
                                     ItemsSource="{Binding CultivateEntries}"
-                                    SelectionMode="None"
-                                    StretchContentForSingleRow="False">
-                                    <cwucont:AdaptiveGridView.ItemTemplate>
+                                    SelectionMode="None">
+                                    <ItemsView.Layout>
+                                        <UniformGridLayout
+                                            ItemsJustification="Start"
+                                            ItemsStretch="Fill"
+                                            MinColumnSpacing="12"
+                                            MinItemWidth="300"
+                                            MinRowSpacing="-4"/>
+                                    </ItemsView.Layout>
+                                    <ItemsView.ItemTemplate>
                                         <DataTemplate>
-                                            <Border Style="{StaticResource BorderCardStyle}">
-                                                <Grid Background="Transparent">
-                                                    <Grid.RowDefinitions>
-                                                        <RowDefinition Height="auto"/>
-                                                        <RowDefinition Height="auto"/>
-                                                        <RowDefinition Height="auto"/>
-                                                    </Grid.RowDefinitions>
-                                                    <Grid Grid.Row="0" Margin="8">
-                                                        <Grid.ColumnDefinitions>
-                                                            <ColumnDefinition Width="auto"/>
-                                                            <ColumnDefinition/>
-                                                            <ColumnDefinition Width="auto"/>
-                                                        </Grid.ColumnDefinitions>
-                                                        <shvco:ItemIcon
-                                                            Width="48"
-                                                            Height="48"
-                                                            Icon="{Binding Icon}"
-                                                            Quality="{Binding Quality}"/>
-                                                        <TextBlock
-                                                            Grid.Column="1"
-                                                            Margin="8,0,0,0"
-                                                            VerticalAlignment="Center"
-                                                            Text="{Binding Name}"/>
-                                                        <StackPanel
-                                                            x:Name="ButtonPanel"
-                                                            Grid.Column="2"
-                                                            Orientation="Horizontal"
-                                                            Visibility="Collapsed">
-                                                            <Button
+                                            <ItemContainer Margin="0,0,0,16">
+                                                <ItemContainer.Resources>
+                                                    <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
+                                                </ItemContainer.Resources>
+                                                <Border Style="{StaticResource BorderCardStyle}">
+                                                    <Grid Background="Transparent">
+                                                        <Grid.RowDefinitions>
+                                                            <RowDefinition Height="auto"/>
+                                                            <RowDefinition Height="auto"/>
+                                                            <RowDefinition Height="auto"/>
+                                                        </Grid.RowDefinitions>
+                                                        <Grid Grid.Row="0" Margin="8">
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="auto"/>
+                                                                <ColumnDefinition/>
+                                                                <ColumnDefinition Width="auto"/>
+                                                            </Grid.ColumnDefinitions>
+                                                            <shvco:ItemIcon
                                                                 Width="48"
                                                                 Height="48"
+                                                                Icon="{Binding Icon}"
+                                                                Quality="{Binding Quality}"/>
+                                                            <TextBlock
+                                                                Grid.Column="1"
                                                                 Margin="8,0,0,0"
-                                                                Background="Transparent"
-                                                                Command="{Binding Path=DataContext.RemoveEntryCommand, Source={StaticResource BindingProxy}}"
-                                                                CommandParameter="{Binding}"
-                                                                Content="&#xE74D;"
-                                                                FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                                                Style="{StaticResource ButtonRevealStyle}"
-                                                                ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageCultivationRemoveEntry}"/>
-                                                        </StackPanel>
-                                                    </Grid>
-                                                    <MenuFlyoutSeparator Grid.Row="1"/>
-                                                    <ScrollViewer
-                                                        Grid.Row="2"
-                                                        Height="296"
-                                                        Margin="0,2,0,0">
-                                                        <ItemsControl Margin="8,0,8,8" ItemsSource="{Binding Items}">
-                                                            <ItemsControl.ItemTemplate>
-                                                                <DataTemplate>
-                                                                    <Grid Margin="0,4,0,0">
-                                                                        <Grid.ColumnDefinitions>
-                                                                            <ColumnDefinition Width="auto"/>
-                                                                            <ColumnDefinition/>
-                                                                        </Grid.ColumnDefinitions>
-                                                                        <Grid>
-                                                                            <shvco:ItemIcon
-                                                                                Width="32"
-                                                                                Height="32"
-                                                                                Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
-                                                                                Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}"
-                                                                                Quality="{Binding Inner.RankLevel}"/>
-                                                                            <FontIcon
-                                                                                HorizontalAlignment="Center"
-                                                                                VerticalAlignment="Center"
-                                                                                FontSize="24"
-                                                                                Glyph="&#xE73E;"
-                                                                                Visibility="{Binding IsFinished, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                                                        </Grid>
-                                                                        <Button
-                                                                            Grid.Column="1"
-                                                                            Height="32"
-                                                                            Margin="6,0,0,0"
-                                                                            HorizontalAlignment="Stretch"
-                                                                            HorizontalContentAlignment="Stretch"
-                                                                            Background="{Binding IsToday, Converter={StaticResource BoolToBrushSelector}}"
-                                                                            Command="{Binding Path=DataContext.FinishStateCommand, Source={StaticResource BindingProxy}}"
-                                                                            CommandParameter="{Binding}"
-                                                                            Style="{StaticResource ButtonRevealStyle}">
-                                                                            <Grid Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}">
-                                                                                <Grid.ColumnDefinitions>
-                                                                                    <ColumnDefinition Width="auto"/>
-                                                                                    <ColumnDefinition/>
-                                                                                </Grid.ColumnDefinitions>
-                                                                                <TextBlock
-                                                                                    Grid.Column="0"
-                                                                                    Margin="0,0,0,0"
+                                                                VerticalAlignment="Center"
+                                                                Text="{Binding Name}"/>
+                                                            <StackPanel
+                                                                x:Name="ButtonPanel"
+                                                                Grid.Column="2"
+                                                                Orientation="Horizontal"
+                                                                Visibility="Collapsed">
+                                                                <Button
+                                                                    Width="48"
+                                                                    Height="48"
+                                                                    Margin="8,0,0,0"
+                                                                    Background="Transparent"
+                                                                    Command="{Binding Path=DataContext.RemoveEntryCommand, Source={StaticResource BindingProxy}}"
+                                                                    CommandParameter="{Binding}"
+                                                                    Content="&#xE74D;"
+                                                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                                                    Style="{StaticResource ButtonRevealStyle}"
+                                                                    ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageCultivationRemoveEntry}"/>
+                                                            </StackPanel>
+                                                        </Grid>
+                                                        <MenuFlyoutSeparator Grid.Row="1"/>
+                                                        <ScrollViewer
+                                                            Grid.Row="2"
+                                                            Height="296"
+                                                            Margin="0,2,0,0">
+                                                            <ItemsControl Margin="8,0,8,8" ItemsSource="{Binding Items}">
+                                                                <ItemsControl.ItemTemplate>
+                                                                    <DataTemplate>
+                                                                        <Grid Margin="0,4,0,0">
+                                                                            <Grid.ColumnDefinitions>
+                                                                                <ColumnDefinition Width="auto"/>
+                                                                                <ColumnDefinition/>
+                                                                            </Grid.ColumnDefinitions>
+                                                                            <Grid>
+                                                                                <shvco:ItemIcon
+                                                                                    Width="32"
+                                                                                    Height="32"
+                                                                                    Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
+                                                                                    Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}"
+                                                                                    Quality="{Binding Inner.RankLevel}"/>
+                                                                                <FontIcon
+                                                                                    HorizontalAlignment="Center"
                                                                                     VerticalAlignment="Center"
-                                                                                    Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
-                                                                                    Text="{Binding Inner.Name}"
-                                                                                    TextTrimming="CharacterEllipsis"/>
-                                                                                <TextBlock
-                                                                                    Grid.Column="1"
-                                                                                    HorizontalAlignment="Right"
-                                                                                    VerticalAlignment="Center"
-                                                                                    Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
-                                                                                    Text="{Binding Entity.Count}"/>
+                                                                                    FontSize="24"
+                                                                                    Glyph="&#xE73E;"
+                                                                                    Visibility="{Binding IsFinished, Converter={StaticResource BoolToVisibilityConverter}}"/>
                                                                             </Grid>
-                                                                        </Button>
-                                                                    </Grid>
-                                                                </DataTemplate>
-                                                            </ItemsControl.ItemTemplate>
-                                                        </ItemsControl>
-                                                    </ScrollViewer>
+                                                                            <Button
+                                                                                Grid.Column="1"
+                                                                                Height="32"
+                                                                                Margin="6,0,0,0"
+                                                                                HorizontalAlignment="Stretch"
+                                                                                HorizontalContentAlignment="Stretch"
+                                                                                Background="{Binding IsToday, Converter={StaticResource BoolToBrushSelector}}"
+                                                                                Command="{Binding Path=DataContext.FinishStateCommand, Source={StaticResource BindingProxy}}"
+                                                                                CommandParameter="{Binding}"
+                                                                                Style="{StaticResource ButtonRevealStyle}">
+                                                                                <Grid Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}">
+                                                                                    <Grid.ColumnDefinitions>
+                                                                                        <ColumnDefinition Width="auto"/>
+                                                                                        <ColumnDefinition/>
+                                                                                    </Grid.ColumnDefinitions>
+                                                                                    <TextBlock
+                                                                                        Grid.Column="0"
+                                                                                        Margin="0,0,0,0"
+                                                                                        VerticalAlignment="Center"
+                                                                                        Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
+                                                                                        Text="{Binding Inner.Name}"
+                                                                                        TextTrimming="CharacterEllipsis"/>
+                                                                                    <TextBlock
+                                                                                        Grid.Column="1"
+                                                                                        HorizontalAlignment="Right"
+                                                                                        VerticalAlignment="Center"
+                                                                                        Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
+                                                                                        Text="{Binding Entity.Count}"/>
+                                                                                </Grid>
+                                                                            </Button>
+                                                                        </Grid>
+                                                                    </DataTemplate>
+                                                                </ItemsControl.ItemTemplate>
+                                                            </ItemsControl>
+                                                        </ScrollViewer>
 
-                                                    <Grid.Resources>
-                                                        <Storyboard x:Name="ButtonPanelVisibleStoryboard">
-                                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                                                <DiscreteObjectKeyFrame KeyTime="0">
-                                                                    <DiscreteObjectKeyFrame.Value>
-                                                                        <Visibility>Visible</Visibility>
-                                                                    </DiscreteObjectKeyFrame.Value>
-                                                                </DiscreteObjectKeyFrame>
-                                                            </ObjectAnimationUsingKeyFrames>
-                                                        </Storyboard>
+                                                        <Grid.Resources>
+                                                            <Storyboard x:Name="ButtonPanelVisibleStoryboard">
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0">
+                                                                        <DiscreteObjectKeyFrame.Value>
+                                                                            <Visibility>Visible</Visibility>
+                                                                        </DiscreteObjectKeyFrame.Value>
+                                                                    </DiscreteObjectKeyFrame>
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                            </Storyboard>
 
-                                                        <Storyboard x:Name="ButtonPanelCollapsedStoryboard">
-                                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                                                <DiscreteObjectKeyFrame KeyTime="0">
-                                                                    <DiscreteObjectKeyFrame.Value>
-                                                                        <Visibility>Collapsed</Visibility>
-                                                                    </DiscreteObjectKeyFrame.Value>
-                                                                </DiscreteObjectKeyFrame>
-                                                            </ObjectAnimationUsingKeyFrames>
-                                                        </Storyboard>
-                                                    </Grid.Resources>
+                                                            <Storyboard x:Name="ButtonPanelCollapsedStoryboard">
+                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
+                                                                    <DiscreteObjectKeyFrame KeyTime="0">
+                                                                        <DiscreteObjectKeyFrame.Value>
+                                                                            <Visibility>Collapsed</Visibility>
+                                                                        </DiscreteObjectKeyFrame.Value>
+                                                                    </DiscreteObjectKeyFrame>
+                                                                </ObjectAnimationUsingKeyFrames>
+                                                            </Storyboard>
+                                                        </Grid.Resources>
 
-                                                    <mxi:Interaction.Behaviors>
-                                                        <mxic:EventTriggerBehavior EventName="PointerEntered">
-                                                            <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelVisibleStoryboard}"/>
-                                                        </mxic:EventTriggerBehavior>
-                                                        <mxic:EventTriggerBehavior EventName="PointerExited">
-                                                            <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelCollapsedStoryboard}"/>
-                                                        </mxic:EventTriggerBehavior>
-                                                    </mxi:Interaction.Behaviors>
-                                                </Grid>
-                                            </Border>
+                                                        <mxi:Interaction.Behaviors>
+                                                            <mxic:EventTriggerBehavior EventName="PointerEntered">
+                                                                <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelVisibleStoryboard}"/>
+                                                            </mxic:EventTriggerBehavior>
+                                                            <mxic:EventTriggerBehavior EventName="PointerExited">
+                                                                <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelCollapsedStoryboard}"/>
+                                                            </mxic:EventTriggerBehavior>
+                                                        </mxi:Interaction.Behaviors>
+                                                    </Grid>
+                                                </Border>
+                                            </ItemContainer>
                                         </DataTemplate>
-                                    </cwucont:AdaptiveGridView.ItemTemplate>
-                                </cwucont:AdaptiveGridView>
+                                    </ItemsView.ItemTemplate>
+                                </ItemsView>
                             </PivotItem>
                             <PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationMaterialStatistics}">
-                                <cwucont:AdaptiveGridView
-                                    Padding="16,16,4,4"
-                                    cwa:ItemsReorderAnimation.Duration="0:0:0.1"
-                                    DesiredWidth="320"
-                                    ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
+                                <ItemsView
+                                    Padding="16,0"
+                                    IsItemInvokedEnabled="False"
                                     ItemsSource="{Binding StatisticsItems}"
-                                    SelectionMode="None"
-                                    StretchContentForSingleRow="False">
-                                    <cwucont:AdaptiveGridView.Resources>
-                                        <x:Double x:Key="GridViewItemMinHeight">0</x:Double>
-                                    </cwucont:AdaptiveGridView.Resources>
-                                    <cwucont:AdaptiveGridView.ItemTemplate>
+                                    SelectionMode="None">
+                                    <ItemsView.Layout>
+                                        <UniformGridLayout
+                                            ItemsJustification="Start"
+                                            ItemsStretch="Fill"
+                                            MinColumnSpacing="12"
+                                            MinItemWidth="300"
+                                            MinRowSpacing="-4"/>
+                                    </ItemsView.Layout>
+                                    <ItemsView.ItemTemplate>
                                         <DataTemplate>
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="auto"/>
-                                                    <ColumnDefinition/>
-                                                    <ColumnDefinition Width="auto"/>
-                                                </Grid.ColumnDefinitions>
-                                                <shvco:ItemIcon
-                                                    Grid.Column="0"
-                                                    Width="32"
-                                                    Height="32"
-                                                    Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
-                                                    Quality="{Binding Inner.RankLevel}"/>
-                                                <TextBlock
-                                                    Grid.Column="1"
-                                                    Margin="16,0,0,0"
-                                                    VerticalAlignment="Center"
-                                                    Text="{Binding Inner.Name}"
-                                                    TextTrimming="CharacterEllipsis"/>
-                                                <TextBlock
-                                                    Grid.Column="2"
-                                                    Margin="16,0,4,0"
-                                                    HorizontalAlignment="Right"
-                                                    VerticalAlignment="Center"
-                                                    Text="{Binding CountFormatted}"/>
-                                            </Grid>
+                                            <ItemContainer Margin="0,0,0,16">
+                                                <ItemContainer.Resources>
+                                                    <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
+                                                    <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
+                                                </ItemContainer.Resources>
+                                                <Grid>
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="auto"/>
+                                                        <ColumnDefinition/>
+                                                        <ColumnDefinition Width="auto"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <shvco:ItemIcon
+                                                        Grid.Column="0"
+                                                        Width="32"
+                                                        Height="32"
+                                                        Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
+                                                        Quality="{Binding Inner.RankLevel}"/>
+                                                    <TextBlock
+                                                        Grid.Column="1"
+                                                        Margin="16,0,0,0"
+                                                        VerticalAlignment="Center"
+                                                        Text="{Binding Inner.Name}"
+                                                        TextTrimming="CharacterEllipsis"/>
+                                                    <TextBlock
+                                                        Grid.Column="2"
+                                                        Margin="16,0,4,0"
+                                                        HorizontalAlignment="Right"
+                                                        VerticalAlignment="Center"
+                                                        Text="{Binding CountFormatted}"/>
+                                                </Grid>
+                                            </ItemContainer>
+
                                         </DataTemplate>
-                                    </cwucont:AdaptiveGridView.ItemTemplate>
-                                </cwucont:AdaptiveGridView>
+                                    </ItemsView.ItemTemplate>
+                                </ItemsView>
                             </PivotItem>
                         </Pivot>
                         <StackPanel
@@ -317,46 +337,53 @@
                     </Grid>
                 </PivotItem>
                 <PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationInventoryItem}">
-                    <cwucont:AdaptiveGridView
-                        Padding="16,16,4,4"
-                        ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
-                        ItemsSource="{Binding InventoryItems}"
-                        SelectionMode="None"
-                        StretchContentForSingleRow="False">
-                        <cwucont:AdaptiveGridView.ItemTemplate>
-                            <DataTemplate>
-                                <Button
-                                    Padding="0"
-                                    Background="Transparent"
-                                    BorderBrush="{x:Null}"
-                                    BorderThickness="0"
-                                    CornerRadius="{StaticResource CompatCornerRadius}">
-                                    <shvco:BottomTextControl Text="{Binding Count, Mode=OneWay}">
-                                        <shvco:ItemIcon Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding Inner.RankLevel}"/>
-                                    </shvco:BottomTextControl>
-                                    <Button.Flyout>
-                                        <Flyout>
-                                            <Grid>
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition/>
-                                                    <RowDefinition/>
-                                                    <RowDefinition/>
-                                                </Grid.RowDefinitions>
-                                                <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Inner.Name}"/>
-                                                <NumberBox
-                                                    Grid.Row="1"
-                                                    MinWidth="160"
-                                                    Margin="0,16,0,0"
-                                                    Maximum="4294967295"
-                                                    Minimum="0"
-                                                    Value="{Binding Count, Mode=TwoWay}"/>
-                                            </Grid>
-                                        </Flyout>
-                                    </Button.Flyout>
-                                </Button>
-                            </DataTemplate>
-                        </cwucont:AdaptiveGridView.ItemTemplate>
-                    </cwucont:AdaptiveGridView>
+                    <ScrollView HorizontalScrollBarVisibility="Hidden">
+                        <ItemsRepeater Margin="16" ItemsSource="{Binding InventoryItems}">
+                            <ItemsRepeater.Layout>
+                                <cwc:WrapLayout HorizontalSpacing="12" VerticalSpacing="12"/>
+                            </ItemsRepeater.Layout>
+                            <ItemsRepeater.ItemTemplate>
+                                <DataTemplate>
+                                    <ItemContainer>
+                                        <ItemContainer.Resources>
+                                            <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
+                                            <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
+                                        </ItemContainer.Resources>
+                                        <Button
+                                            Padding="0"
+                                            Background="Transparent"
+                                            BorderBrush="{x:Null}"
+                                            BorderThickness="0"
+                                            CornerRadius="{StaticResource CompatCornerRadius}">
+                                            <shvco:BottomTextControl Text="{Binding Count, Mode=OneWay}">
+                                                <shvco:ItemIcon Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding Inner.RankLevel}"/>
+                                            </shvco:BottomTextControl>
+                                            <Button.Flyout>
+                                                <Flyout>
+                                                    <Grid>
+                                                        <Grid.RowDefinitions>
+                                                            <RowDefinition/>
+                                                            <RowDefinition/>
+                                                            <RowDefinition/>
+                                                        </Grid.RowDefinitions>
+                                                        <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Inner.Name}"/>
+                                                        <NumberBox
+                                                            Grid.Row="1"
+                                                            MinWidth="160"
+                                                            Margin="0,16,0,0"
+                                                            Maximum="4294967295"
+                                                            Minimum="0"
+                                                            Value="{Binding Count, Mode=TwoWay}"/>
+                                                    </Grid>
+                                                </Flyout>
+                                            </Button.Flyout>
+                                        </Button>
+                                    </ItemContainer>
+                                </DataTemplate>
+                            </ItemsRepeater.ItemTemplate>
+                        </ItemsRepeater>
+                    </ScrollView>
+
                 </PivotItem>
             </Pivot>
         </Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index f1f90509..e65e64b9 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -181,352 +181,359 @@
                     </StackPanel>
                 </ScrollViewer>
             </SplitView.Pane>
-            <ScrollViewer>
-                <cwuc:AdaptiveGridView
-                    Margin="16,16,4,-4"
-                    cwa:ItemsReorderAnimation.Duration="0:0:0.1"
-                    DesiredWidth="280"
-                    ItemContainerStyle="{StaticResource LargeGridViewItemStyle}"
-                    ItemsSource="{Binding DailyNoteEntries}"
-                    SelectionMode="None"
-                    StretchContentForSingleRow="False">
-                    <cwuc:AdaptiveGridView.ItemTemplate>
+            <ScrollView>
+                <ItemsRepeater Margin="16" ItemsSource="{Binding DailyNoteEntries}">
+                    <ItemsRepeater.Layout>
+                        <UniformGridLayout
+                            ItemsJustification="Start"
+                            ItemsStretch="Fill"
+                            MinColumnSpacing="12"
+                            MinItemWidth="300"
+                            MinRowSpacing="-4"/>
+                    </ItemsRepeater.Layout>
+                    <ItemsRepeater.ItemTemplate>
                         <DataTemplate>
-                            <Grid Padding="8" Style="{StaticResource BorderGridStyle}">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="auto"/>
-                                    <RowDefinition Height="auto"/>
-                                    <RowDefinition Height="auto"/>
-                                    <RowDefinition Height="auto"/>
-                                    <RowDefinition Height="auto"/>
-                                </Grid.RowDefinitions>
+                            <ItemContainer>
+                                <ItemContainer.Resources>
+                                    <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
+                                    <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
+                                </ItemContainer.Resources>
+                                <Grid Padding="8" Style="{StaticResource BorderGridStyle}">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="auto"/>
+                                        <RowDefinition Height="auto"/>
+                                        <RowDefinition Height="auto"/>
+                                        <RowDefinition Height="auto"/>
+                                        <RowDefinition Height="auto"/>
+                                    </Grid.RowDefinitions>
 
-                                <Grid.Resources>
-                                    <Storyboard x:Name="ButtonPanelVisibleStoryboard">
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
+                                    <Grid.Resources>
+                                        <Storyboard x:Name="ButtonPanelVisibleStoryboard">
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <Visibility>Visible</Visibility>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
 
-                                    <Storyboard x:Name="ButtonPanelCollapsedStoryboard">
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </Grid.Resources>
+                                        <Storyboard x:Name="ButtonPanelCollapsedStoryboard">
+                                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
+                                                <DiscreteObjectKeyFrame KeyTime="0">
+                                                    <DiscreteObjectKeyFrame.Value>
+                                                        <Visibility>Collapsed</Visibility>
+                                                    </DiscreteObjectKeyFrame.Value>
+                                                </DiscreteObjectKeyFrame>
+                                            </ObjectAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </Grid.Resources>
 
-                                <mxi:Interaction.Behaviors>
-                                    <mxic:EventTriggerBehavior EventName="PointerEntered">
-                                        <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelVisibleStoryboard}"/>
-                                    </mxic:EventTriggerBehavior>
-                                    <mxic:EventTriggerBehavior EventName="PointerExited">
-                                        <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelCollapsedStoryboard}"/>
-                                    </mxic:EventTriggerBehavior>
-                                </mxi:Interaction.Behaviors>
+                                    <mxi:Interaction.Behaviors>
+                                        <mxic:EventTriggerBehavior EventName="PointerEntered">
+                                            <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelVisibleStoryboard}"/>
+                                        </mxic:EventTriggerBehavior>
+                                        <mxic:EventTriggerBehavior EventName="PointerExited">
+                                            <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelCollapsedStoryboard}"/>
+                                        </mxic:EventTriggerBehavior>
+                                    </mxi:Interaction.Behaviors>
 
-                                <Grid MinHeight="40" HorizontalAlignment="Stretch">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition/>
-                                        <ColumnDefinition Width="auto"/>
-                                    </Grid.ColumnDefinitions>
+                                    <Grid MinHeight="40" HorizontalAlignment="Stretch">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition/>
+                                            <ColumnDefinition Width="auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock
+                                            Grid.Column="0"
+                                            Margin="4,2,0,4"
+                                            VerticalAlignment="Center"
+                                            Style="{StaticResource BaseTextBlockStyle}"
+                                            Text="{Binding UserGameRole}"
+                                            TextTrimming="CharacterEllipsis"
+                                            TextWrapping="NoWrap"/>
+                                        <StackPanel
+                                            x:Name="ButtonPanel"
+                                            Grid.Column="1"
+                                            HorizontalAlignment="Right"
+                                            Orientation="Horizontal"
+                                            Visibility="Collapsed">
+                                            <Button
+                                                Margin="8,0,0,0"
+                                                HorizontalAlignment="Right"
+                                                VerticalAlignment="Stretch"
+                                                shch:FrameworkElementHelper.SquareLength="40"
+                                                Background="Transparent"
+                                                BorderBrush="{x:Null}"
+                                                BorderThickness="0"
+                                                Command="{Binding DataContext.RemoveDailyNoteCommand, Source={StaticResource ViewModelBindingProxy}}"
+                                                CommandParameter="{Binding}"
+                                                Content="{StaticResource FontIconContentDelete}"
+                                                FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                                ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteRemoveToolTip}"/>
+                                            <Button
+                                                Margin="8,0,0,0"
+                                                VerticalAlignment="Stretch"
+                                                shch:FrameworkElementHelper.SquareLength="40"
+                                                Background="Transparent"
+                                                BorderBrush="{x:Null}"
+                                                BorderThickness="0"
+                                                Command="{Binding DataContext.ModifyNotificationCommand, Source={StaticResource ViewModelBindingProxy}}"
+                                                CommandParameter="{Binding}"
+                                                Content="{StaticResource FontIconContentSetting}"
+                                                FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                                ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteNotificationSetting}"/>
+                                        </StackPanel>
+                                    </Grid>
+
+                                    <StackPanel
+                                        Grid.Row="1"
+                                        Margin="0,8,0,0"
+                                        Spacing="6">
+                                        <Grid Style="{ThemeResource BorderGridStyle}">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="auto"/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+                                            <ProgressBar
+                                                Grid.ColumnSpan="2"
+                                                Height="40"
+                                                MinHeight="48"
+                                                Background="{x:Null}"
+                                                CornerRadius="{ThemeResource ControlCornerRadius}"
+                                                Maximum="{Binding DailyNote.MaxResin, Mode=OneWay}"
+                                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                                                Value="{Binding DailyNote.CurrentResin, Mode=OneWay}"/>
+                                            <shci:CachedImage
+                                                Grid.Column="0"
+                                                Margin="4"
+                                                VerticalAlignment="Center"
+                                                shch:FrameworkElementHelper.SquareLength="32"
+                                                Source="{StaticResource UI_ItemIcon_210}"/>
+                                            <StackPanel
+                                                Grid.Column="1"
+                                                Margin="8,0,0,0"
+                                                VerticalAlignment="Center">
+                                                <TextBlock
+                                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                                    Text="{Binding DailyNote.ResinFormatted, Mode=OneWay}"
+                                                    TextTrimming="CharacterEllipsis"
+                                                    TextWrapping="NoWrap"/>
+                                                <TextBlock
+                                                    Opacity="0.6"
+                                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                                    Text="{Binding DailyNote.ResinRecoveryTargetTime, Mode=OneWay}"
+                                                    TextTrimming="CharacterEllipsis"
+                                                    TextWrapping="NoWrap"/>
+                                            </StackPanel>
+                                        </Grid>
+                                        <Grid Style="{ThemeResource BorderGridStyle}">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="auto"/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+                                            <ProgressBar
+                                                Grid.ColumnSpan="2"
+                                                Height="40"
+                                                MinHeight="48"
+                                                Background="{x:Null}"
+                                                CornerRadius="{ThemeResource ControlCornerRadius}"
+                                                Maximum="{Binding DailyNote.MaxHomeCoin, Mode=OneWay}"
+                                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                                                Value="{Binding DailyNote.CurrentHomeCoin, Mode=OneWay}"/>
+                                            <shci:CachedImage
+                                                Grid.Column="0"
+                                                Margin="4"
+                                                VerticalAlignment="Center"
+                                                shch:FrameworkElementHelper.SquareLength="32"
+                                                Source="{StaticResource UI_ItemIcon_204}"/>
+                                            <StackPanel
+                                                Grid.Column="1"
+                                                Margin="8,0,0,0"
+                                                VerticalAlignment="Center">
+                                                <TextBlock
+                                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                                    Text="{Binding DailyNote.HomeCoinFormatted, Mode=OneWay}"
+                                                    TextTrimming="CharacterEllipsis"
+                                                    TextWrapping="NoWrap"/>
+                                                <TextBlock
+                                                    Opacity="0.6"
+                                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                                    Text="{Binding DailyNote.HomeCoinRecoveryTargetTimeFormatted, Mode=OneWay}"
+                                                    TextTrimming="CharacterEllipsis"
+                                                    TextWrapping="NoWrap"/>
+                                            </StackPanel>
+                                        </Grid>
+                                        <Grid Style="{ThemeResource BorderGridStyle}">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="auto"/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+                                            <ProgressBar
+                                                Grid.ColumnSpan="2"
+                                                Height="40"
+                                                MinHeight="48"
+                                                Background="{x:Null}"
+                                                CornerRadius="{ThemeResource ControlCornerRadius}"
+                                                Maximum="{Binding DailyNote.TotalTaskNum, Mode=OneWay}"
+                                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                                                Value="{Binding DailyNote.FinishedTaskNum, Mode=OneWay}"/>
+                                            <shci:CachedImage
+                                                Grid.Column="0"
+                                                Margin="4"
+                                                VerticalAlignment="Center"
+                                                shch:FrameworkElementHelper.SquareLength="32"
+                                                Source="{StaticResource UI_MarkQuest_Events_Proce}"/>
+                                            <StackPanel
+                                                Grid.Column="1"
+                                                Margin="8,0,0,0"
+                                                VerticalAlignment="Center">
+                                                <TextBlock
+                                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                                    Text="{Binding DailyNote.TaskFormatted, Mode=OneWay}"
+                                                    TextTrimming="CharacterEllipsis"
+                                                    TextWrapping="NoWrap"/>
+                                                <TextBlock
+                                                    Opacity="0.6"
+                                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                                    Text="{Binding DailyNote.ExtraTaskRewardDescription, Mode=OneWay}"
+                                                    TextTrimming="CharacterEllipsis"
+                                                    TextWrapping="NoWrap"/>
+                                            </StackPanel>
+                                        </Grid>
+                                        <Grid Style="{ThemeResource BorderGridStyle}">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="auto"/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+                                            <ProgressBar
+                                                Grid.ColumnSpan="2"
+                                                Height="40"
+                                                MinHeight="48"
+                                                Background="{x:Null}"
+                                                CornerRadius="{ThemeResource ControlCornerRadius}"
+                                                Maximum="{Binding DailyNote.ResinDiscountNumLimit, Mode=OneWay}"
+                                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                                                Value="{Binding DailyNote.ResinDiscountUsedNum, Mode=OneWay}"/>
+                                            <shci:CachedImage
+                                                Grid.Column="0"
+                                                Margin="4"
+                                                VerticalAlignment="Center"
+                                                shch:FrameworkElementHelper.SquareLength="32"
+                                                Source="{StaticResource UI_MarkTower}"/>
+                                            <StackPanel
+                                                Grid.Column="1"
+                                                Margin="8,0,0,0"
+                                                VerticalAlignment="Center">
+                                                <TextBlock
+                                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                                    Text="{Binding DailyNote.ResinDiscountFormatted, Mode=OneWay}"
+                                                    TextTrimming="CharacterEllipsis"
+                                                    TextWrapping="NoWrap"/>
+                                                <TextBlock
+                                                    Opacity="0.6"
+                                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                                    Text="{shcm:ResourceString Name=ViewPageDailyNoteResinDiscountUsed}"
+                                                    TextTrimming="CharacterEllipsis"
+                                                    TextWrapping="NoWrap"/>
+                                            </StackPanel>
+                                        </Grid>
+                                        <Grid Style="{ThemeResource BorderGridStyle}">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="auto"/>
+                                                <ColumnDefinition/>
+                                            </Grid.ColumnDefinitions>
+                                            <ProgressBar
+                                                Grid.ColumnSpan="2"
+                                                Height="40"
+                                                MinHeight="48"
+                                                Background="{x:Null}"
+                                                CornerRadius="{ThemeResource ControlCornerRadius}"
+                                                Maximum="604800"
+                                                Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                                                Value="{Binding DailyNote.Transformer.RecoveryTime.TotalSeconds, Mode=OneWay}"/>
+                                            <shci:CachedImage
+                                                Grid.Column="0"
+                                                Margin="4"
+                                                VerticalAlignment="Center"
+                                                shch:FrameworkElementHelper.SquareLength="32"
+                                                Source="{StaticResource UI_ItemIcon_220021}"/>
+                                            <StackPanel
+                                                Grid.Column="1"
+                                                Margin="8,0,0,0"
+                                                VerticalAlignment="Center">
+                                                <TextBlock
+                                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                                    Text="{Binding DailyNote.Transformer.ObtainedAndReachedFormatted, Mode=OneWay}"
+                                                    TextTrimming="CharacterEllipsis"
+                                                    TextWrapping="NoWrap"/>
+                                                <TextBlock
+                                                    Opacity="0.6"
+                                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                                    Text="{Binding DailyNote.Transformer.ObtainedAndTimeFormatted, Mode=OneWay}"
+                                                    TextTrimming="CharacterEllipsis"
+                                                    TextWrapping="NoWrap"/>
+                                            </StackPanel>
+                                        </Grid>
+                                    </StackPanel>
+
+                                    <MenuFlyoutSeparator Grid.Row="2" Margin="6,6,6,0"/>
+
+                                    <ItemsControl
+                                        Grid.Row="3"
+                                        Margin="0,6,0,0"
+                                        ItemsSource="{Binding DailyNote.Expeditions, Mode=OneWay}">
+                                        <ItemsControl.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <cwuc:UniformGrid
+                                                    ColumnSpacing="8"
+                                                    Columns="2"
+                                                    RowSpacing="8"/>
+                                            </ItemsPanelTemplate>
+                                        </ItemsControl.ItemsPanel>
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate>
+                                                <Grid Style="{ThemeResource BorderGridStyle}">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="auto"/>
+                                                        <ColumnDefinition/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <ProgressBar
+                                                        Grid.ColumnSpan="2"
+                                                        MinHeight="40"
+                                                        HorizontalAlignment="Stretch"
+                                                        Background="{x:Null}"
+                                                        CornerRadius="{ThemeResource ControlCornerRadius}"
+                                                        Maximum="{Binding TotalTime, Mode=OneWay}"
+                                                        Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
+                                                        Value="{Binding PassedTime, Mode=OneWay}"/>
+                                                    <shci:CachedImage
+                                                        Margin="0,0,0,8"
+                                                        shch:FrameworkElementHelper.SquareLength="32"
+                                                        Source="{Binding AvatarSideIcon, Mode=OneWay}"/>
+                                                    <TextBlock
+                                                        Grid.Column="1"
+                                                        Margin="16,0,0,0"
+                                                        VerticalAlignment="Center"
+                                                        Style="{StaticResource BaseTextBlockStyle}"
+                                                        Text="{Binding RemainedTimeFormatted, Mode=OneWay}"/>
+                                                </Grid>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
                                     <TextBlock
-                                        Grid.Column="0"
-                                        Margin="4,2,0,4"
-                                        VerticalAlignment="Center"
-                                        Style="{StaticResource BaseTextBlockStyle}"
-                                        Text="{Binding UserGameRole}"
+                                        Grid.Row="4"
+                                        Margin="0,6,0,0"
+                                        Opacity="0.7"
+                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                        Text="{Binding RefreshTimeFormatted}"
                                         TextTrimming="CharacterEllipsis"
                                         TextWrapping="NoWrap"/>
-                                    <StackPanel
-                                        x:Name="ButtonPanel"
-                                        Grid.Column="1"
-                                        HorizontalAlignment="Right"
-                                        Orientation="Horizontal"
-                                        Visibility="Collapsed">
-                                        <Button
-                                            Margin="8,0,0,0"
-                                            HorizontalAlignment="Right"
-                                            VerticalAlignment="Stretch"
-                                            shch:FrameworkElementHelper.SquareLength="40"
-                                            Background="Transparent"
-                                            BorderBrush="{x:Null}"
-                                            BorderThickness="0"
-                                            Command="{Binding DataContext.RemoveDailyNoteCommand, Source={StaticResource ViewModelBindingProxy}}"
-                                            CommandParameter="{Binding}"
-                                            Content="{StaticResource FontIconContentDelete}"
-                                            FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                            ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteRemoveToolTip}"/>
-                                        <Button
-                                            Margin="8,0,0,0"
-                                            VerticalAlignment="Stretch"
-                                            shch:FrameworkElementHelper.SquareLength="40"
-                                            Background="Transparent"
-                                            BorderBrush="{x:Null}"
-                                            BorderThickness="0"
-                                            Command="{Binding DataContext.ModifyNotificationCommand, Source={StaticResource ViewModelBindingProxy}}"
-                                            CommandParameter="{Binding}"
-                                            Content="{StaticResource FontIconContentSetting}"
-                                            FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                            ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteNotificationSetting}"/>
-                                    </StackPanel>
                                 </Grid>
-
-                                <StackPanel
-                                    Grid.Row="1"
-                                    Margin="0,8,0,0"
-                                    Spacing="6">
-                                    <Grid Style="{ThemeResource BorderGridStyle}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="auto"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <ProgressBar
-                                            Grid.ColumnSpan="2"
-                                            Height="40"
-                                            MinHeight="48"
-                                            Background="{x:Null}"
-                                            CornerRadius="{ThemeResource ControlCornerRadius}"
-                                            Maximum="{Binding DailyNote.MaxResin, Mode=OneWay}"
-                                            Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                            Value="{Binding DailyNote.CurrentResin, Mode=OneWay}"/>
-                                        <shci:CachedImage
-                                            Grid.Column="0"
-                                            Margin="4"
-                                            VerticalAlignment="Center"
-                                            shch:FrameworkElementHelper.SquareLength="32"
-                                            Source="{StaticResource UI_ItemIcon_210}"/>
-                                        <StackPanel
-                                            Grid.Column="1"
-                                            Margin="8,0,0,0"
-                                            VerticalAlignment="Center">
-                                            <TextBlock
-                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                Text="{Binding DailyNote.ResinFormatted, Mode=OneWay}"
-                                                TextTrimming="CharacterEllipsis"
-                                                TextWrapping="NoWrap"/>
-                                            <TextBlock
-                                                Opacity="0.6"
-                                                Style="{StaticResource CaptionTextBlockStyle}"
-                                                Text="{Binding DailyNote.ResinRecoveryTargetTime, Mode=OneWay}"
-                                                TextTrimming="CharacterEllipsis"
-                                                TextWrapping="NoWrap"/>
-                                        </StackPanel>
-                                    </Grid>
-                                    <Grid Style="{ThemeResource BorderGridStyle}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="auto"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <ProgressBar
-                                            Grid.ColumnSpan="2"
-                                            Height="40"
-                                            MinHeight="48"
-                                            Background="{x:Null}"
-                                            CornerRadius="{ThemeResource ControlCornerRadius}"
-                                            Maximum="{Binding DailyNote.MaxHomeCoin, Mode=OneWay}"
-                                            Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                            Value="{Binding DailyNote.CurrentHomeCoin, Mode=OneWay}"/>
-                                        <shci:CachedImage
-                                            Grid.Column="0"
-                                            Margin="4"
-                                            VerticalAlignment="Center"
-                                            shch:FrameworkElementHelper.SquareLength="32"
-                                            Source="{StaticResource UI_ItemIcon_204}"/>
-                                        <StackPanel
-                                            Grid.Column="1"
-                                            Margin="8,0,0,0"
-                                            VerticalAlignment="Center">
-                                            <TextBlock
-                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                Text="{Binding DailyNote.HomeCoinFormatted, Mode=OneWay}"
-                                                TextTrimming="CharacterEllipsis"
-                                                TextWrapping="NoWrap"/>
-                                            <TextBlock
-                                                Opacity="0.6"
-                                                Style="{StaticResource CaptionTextBlockStyle}"
-                                                Text="{Binding DailyNote.HomeCoinRecoveryTargetTimeFormatted, Mode=OneWay}"
-                                                TextTrimming="CharacterEllipsis"
-                                                TextWrapping="NoWrap"/>
-                                        </StackPanel>
-                                    </Grid>
-                                    <Grid Style="{ThemeResource BorderGridStyle}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="auto"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <ProgressBar
-                                            Grid.ColumnSpan="2"
-                                            Height="40"
-                                            MinHeight="48"
-                                            Background="{x:Null}"
-                                            CornerRadius="{ThemeResource ControlCornerRadius}"
-                                            Maximum="{Binding DailyNote.TotalTaskNum, Mode=OneWay}"
-                                            Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                            Value="{Binding DailyNote.FinishedTaskNum, Mode=OneWay}"/>
-                                        <shci:CachedImage
-                                            Grid.Column="0"
-                                            Margin="4"
-                                            VerticalAlignment="Center"
-                                            shch:FrameworkElementHelper.SquareLength="32"
-                                            Source="{StaticResource UI_MarkQuest_Events_Proce}"/>
-                                        <StackPanel
-                                            Grid.Column="1"
-                                            Margin="8,0,0,0"
-                                            VerticalAlignment="Center">
-                                            <TextBlock
-                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                Text="{Binding DailyNote.TaskFormatted, Mode=OneWay}"
-                                                TextTrimming="CharacterEllipsis"
-                                                TextWrapping="NoWrap"/>
-                                            <TextBlock
-                                                Opacity="0.6"
-                                                Style="{StaticResource CaptionTextBlockStyle}"
-                                                Text="{Binding DailyNote.ExtraTaskRewardDescription, Mode=OneWay}"
-                                                TextTrimming="CharacterEllipsis"
-                                                TextWrapping="NoWrap"/>
-                                        </StackPanel>
-                                    </Grid>
-                                    <Grid Style="{ThemeResource BorderGridStyle}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="auto"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <ProgressBar
-                                            Grid.ColumnSpan="2"
-                                            Height="40"
-                                            MinHeight="48"
-                                            Background="{x:Null}"
-                                            CornerRadius="{ThemeResource ControlCornerRadius}"
-                                            Maximum="{Binding DailyNote.ResinDiscountNumLimit, Mode=OneWay}"
-                                            Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                            Value="{Binding DailyNote.ResinDiscountUsedNum, Mode=OneWay}"/>
-                                        <shci:CachedImage
-                                            Grid.Column="0"
-                                            Margin="4"
-                                            VerticalAlignment="Center"
-                                            shch:FrameworkElementHelper.SquareLength="32"
-                                            Source="{StaticResource UI_MarkTower}"/>
-                                        <StackPanel
-                                            Grid.Column="1"
-                                            Margin="8,0,0,0"
-                                            VerticalAlignment="Center">
-                                            <TextBlock
-                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                Text="{Binding DailyNote.ResinDiscountFormatted, Mode=OneWay}"
-                                                TextTrimming="CharacterEllipsis"
-                                                TextWrapping="NoWrap"/>
-                                            <TextBlock
-                                                Opacity="0.6"
-                                                Style="{StaticResource CaptionTextBlockStyle}"
-                                                Text="{shcm:ResourceString Name=ViewPageDailyNoteResinDiscountUsed}"
-                                                TextTrimming="CharacterEllipsis"
-                                                TextWrapping="NoWrap"/>
-                                        </StackPanel>
-                                    </Grid>
-                                    <Grid Style="{ThemeResource BorderGridStyle}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="auto"/>
-                                            <ColumnDefinition/>
-                                        </Grid.ColumnDefinitions>
-                                        <ProgressBar
-                                            Grid.ColumnSpan="2"
-                                            Height="40"
-                                            MinHeight="48"
-                                            Background="{x:Null}"
-                                            CornerRadius="{ThemeResource ControlCornerRadius}"
-                                            Maximum="604800"
-                                            Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                            Value="{Binding DailyNote.Transformer.RecoveryTime.TotalSeconds, Mode=OneWay}"/>
-                                        <shci:CachedImage
-                                            Grid.Column="0"
-                                            Margin="4"
-                                            VerticalAlignment="Center"
-                                            shch:FrameworkElementHelper.SquareLength="32"
-                                            Source="{StaticResource UI_ItemIcon_220021}"/>
-                                        <StackPanel
-                                            Grid.Column="1"
-                                            Margin="8,0,0,0"
-                                            VerticalAlignment="Center">
-                                            <TextBlock
-                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                Text="{Binding DailyNote.Transformer.ObtainedAndReachedFormatted, Mode=OneWay}"
-                                                TextTrimming="CharacterEllipsis"
-                                                TextWrapping="NoWrap"/>
-                                            <TextBlock
-                                                Opacity="0.6"
-                                                Style="{StaticResource CaptionTextBlockStyle}"
-                                                Text="{Binding DailyNote.Transformer.ObtainedAndTimeFormatted, Mode=OneWay}"
-                                                TextTrimming="CharacterEllipsis"
-                                                TextWrapping="NoWrap"/>
-                                        </StackPanel>
-                                    </Grid>
-                                </StackPanel>
-
-                                <MenuFlyoutSeparator Grid.Row="2" Margin="6,6,6,0"/>
-
-                                <ItemsControl
-                                    Grid.Row="3"
-                                    Margin="0,6,0,0"
-                                    ItemsSource="{Binding DailyNote.Expeditions, Mode=OneWay}">
-                                    <ItemsControl.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <cwuc:UniformGrid
-                                                ColumnSpacing="8"
-                                                Columns="2"
-                                                RowSpacing="8"/>
-                                        </ItemsPanelTemplate>
-                                    </ItemsControl.ItemsPanel>
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <Grid Style="{ThemeResource BorderGridStyle}">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="auto"/>
-                                                    <ColumnDefinition/>
-                                                </Grid.ColumnDefinitions>
-                                                <ProgressBar
-                                                    Grid.ColumnSpan="2"
-                                                    MinHeight="40"
-                                                    HorizontalAlignment="Stretch"
-                                                    Background="{x:Null}"
-                                                    CornerRadius="{ThemeResource ControlCornerRadius}"
-                                                    Maximum="{Binding TotalTime, Mode=OneWay}"
-                                                    Opacity="{StaticResource LargeBackgroundProgressBarOpacity}"
-                                                    Value="{Binding PassedTime, Mode=OneWay}"/>
-                                                <shci:CachedImage
-                                                    Margin="0,0,0,8"
-                                                    shch:FrameworkElementHelper.SquareLength="32"
-                                                    Source="{Binding AvatarSideIcon, Mode=OneWay}"/>
-                                                <TextBlock
-                                                    Grid.Column="1"
-                                                    Margin="16,0,0,0"
-                                                    VerticalAlignment="Center"
-                                                    Style="{StaticResource BaseTextBlockStyle}"
-                                                    Text="{Binding RemainedTimeFormatted, Mode=OneWay}"/>
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
-                                <TextBlock
-                                    Grid.Row="4"
-                                    Margin="0,6,0,0"
-                                    Opacity="0.7"
-                                    Style="{StaticResource CaptionTextBlockStyle}"
-                                    Text="{Binding RefreshTimeFormatted}"
-                                    TextTrimming="CharacterEllipsis"
-                                    TextWrapping="NoWrap"/>
-                            </Grid>
+                            </ItemContainer>
                         </DataTemplate>
-                    </cwuc:AdaptiveGridView.ItemTemplate>
-                </cwuc:AdaptiveGridView>
-            </ScrollViewer>
+                    </ItemsRepeater.ItemTemplate>
+                </ItemsRepeater>
+            </ScrollView>
         </SplitView>
 
     </Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Home/AnnouncementViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Home/AnnouncementViewModel.cs
index c0a0494c..2f1cb605 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Home/AnnouncementViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Home/AnnouncementViewModel.cs
@@ -1,7 +1,6 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.UI.Xaml.Controls;
 using Snap.Hutao.Core.Setting;
 using Snap.Hutao.Service.Abstraction;
 using Snap.Hutao.Service.Hutao;