diff --git a/src/RevitParamsChecker/Resources/CustomDataGrid.xaml b/src/RevitParamsChecker/Resources/CustomDataGrid.xaml
index 0201f1615..a85b55a33 100644
--- a/src/RevitParamsChecker/Resources/CustomDataGrid.xaml
+++ b/src/RevitParamsChecker/Resources/CustomDataGrid.xaml
@@ -109,6 +109,9 @@
         x:Key="CustomDataGridColumnHeaderStyle"
         BasedOn="{StaticResource DefaultUiDataGridColumnHeaderStyle}"
         TargetType="DataGridColumnHeader">
+        <Setter
+            Property="Foreground"
+            Value="{DynamicResource LabelForeground}" />
         <Setter
             Property="Template">
             <Setter.Value>
diff --git a/src/RevitParamsChecker/Resources/CustomExpanderStyle.xaml b/src/RevitParamsChecker/Resources/CustomExpanderStyle.xaml
index e43649814..22c6d2b15 100644
--- a/src/RevitParamsChecker/Resources/CustomExpanderStyle.xaml
+++ b/src/RevitParamsChecker/Resources/CustomExpanderStyle.xaml
@@ -54,25 +54,25 @@
                                             Background="Transparent">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition
-                                                        Width="*" />
                                                     <ColumnDefinition
                                                         Width="Auto" />
+                                                    <ColumnDefinition
+                                                        Width="*" />
                                                 </Grid.ColumnDefinitions>
-                                                <ContentPresenter
-                                                    x:Name="ContentPresenter"
-                                                    Grid.Column="0"
-                                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                    Content="{TemplateBinding Content}" />
                                                 <ui:SymbolIcon
                                                     x:Name="ControlChevronIcon"
-                                                    Grid.Column="1"
-                                                    Margin="0"
+                                                    Grid.Column="0"
+                                                    Margin="0 0 8 0"
                                                     VerticalAlignment="Center"
                                                     FontSize="16"
                                                     Foreground="{TemplateBinding Foreground}"
                                                     Symbol="ChevronDown24" />
+                                                <ContentPresenter
+                                                    x:Name="ContentPresenter"
+                                                    Grid.Column="1"
+                                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                    Content="{TemplateBinding Content}" />
                                             </Grid>
                                         </Border>
                                     </ControlTemplate>
diff --git a/src/RevitParamsChecker/ViewModels/Results/CheckResultViewModel.cs b/src/RevitParamsChecker/ViewModels/Results/CheckResultViewModel.cs
index 7f2eff743..b579eda02 100644
--- a/src/RevitParamsChecker/ViewModels/Results/CheckResultViewModel.cs
+++ b/src/RevitParamsChecker/ViewModels/Results/CheckResultViewModel.cs
@@ -28,7 +28,7 @@ internal class CheckResultViewModel : BaseViewModel {
     private readonly DelayAction _refreshViewDelay;
     private readonly RevitRepository _revitRepo;
     private readonly ObservableCollection<ElementResultViewModel> _allElementResults;
-    private readonly PropertyGroupDescription _defaultGroupDescription;
+    private readonly PropertyGroupDescription _chunkGroupDescription;
     private string _elementsFilter;
     private ElementResultViewModel _selectedElementResult;
     private RuleViewModel _selectedRuleStamp;
@@ -47,13 +47,13 @@ public CheckResultViewModel(ILocalizationService localization, CheckResult check
         _refreshViewDelay = new DelayAction(300, () => ElementResults.View.Refresh());
         var availableProperties = GetEditableGroupProperties(_localization);
         GroupingProperties = new GroupDescriptionsViewModel(availableProperties, [availableProperties.First()]);
-        _defaultGroupDescription = new PropertyGroupDescription(nameof(ElementResultViewModel.ChunkName));
+        _chunkGroupDescription = new PropertyGroupDescription(nameof(ElementResultViewModel.ChunkName));
         if(_allElementResults.Count <= _chunkSize) {
             ResetGrouping(ElementResults, [availableProperties.First().PropertyGroupDescription]);
         } else {
             ResetGrouping(
                 ElementResults,
-                [_defaultGroupDescription, availableProperties.First().PropertyGroupDescription]);
+                [availableProperties.First().PropertyGroupDescription, _chunkGroupDescription]);
         }
 
         PropertyChanged += ElementsFilterPropertyChanged;
@@ -121,7 +121,6 @@ private void ElementResultsFilterHandler(object sender, FilterEventArgs e) {
                          || result.RuleName?.IndexOf(filter, StringComparison.CurrentCultureIgnoreCase) >= 0
                          || result.Status?.IndexOf(filter, StringComparison.CurrentCultureIgnoreCase) >= 0
                          || result.Error?.IndexOf(filter, StringComparison.CurrentCultureIgnoreCase) >= 0
-                         || result.UserMark?.IndexOf(filter, StringComparison.CurrentCultureIgnoreCase) >= 0
                          || result.CategoryName?.IndexOf(filter, StringComparison.CurrentCultureIgnoreCase) >= 0;
         }
     }
@@ -196,7 +195,7 @@ private void RegroupElements() {
         if(_allElementResults.Count <= _chunkSize) {
             ResetGrouping(ElementResults, groups);
         } else {
-            ResetGrouping(ElementResults, [_defaultGroupDescription, .. groups]);
+            ResetGrouping(ElementResults, [.. groups, _chunkGroupDescription]);
         }
     }
 }
diff --git a/src/RevitParamsChecker/ViewModels/Results/ElementResultViewModel.cs b/src/RevitParamsChecker/ViewModels/Results/ElementResultViewModel.cs
index 5f27c9794..1b294f738 100644
--- a/src/RevitParamsChecker/ViewModels/Results/ElementResultViewModel.cs
+++ b/src/RevitParamsChecker/ViewModels/Results/ElementResultViewModel.cs
@@ -13,7 +13,6 @@ internal class ElementResultViewModel : BaseViewModel {
     private readonly ILocalizationService _localization;
     private string _chunkName;
     private int _itemNumber;
-    private string _userMark;
 
     public ElementResultViewModel(ILocalizationService localization, ElementResult elementResult) {
         _localization = localization ?? throw new ArgumentNullException(nameof(localization));
@@ -39,11 +38,6 @@ public int ItemNumber {
         set => RaiseAndSetIfChanged(ref _itemNumber, value);
     }
 
-    public string UserMark {
-        get => _userMark;
-        set => RaiseAndSetIfChanged(ref _userMark, value);
-    }
-
     public string CategoryName { get; }
 
     public string FileName { get; }
diff --git a/src/RevitParamsChecker/Views/Controls/EditableListControl.xaml b/src/RevitParamsChecker/Views/Controls/EditableListControl.xaml
index ddedf330e..b7e017faa 100644
--- a/src/RevitParamsChecker/Views/Controls/EditableListControl.xaml
+++ b/src/RevitParamsChecker/Views/Controls/EditableListControl.xaml
@@ -56,7 +56,7 @@
                     <DataTemplate>
                         <DockPanel
                             Height="20"
-                            Margin="10 4"
+                            Margin="8 4"
                             VerticalAlignment="Center">
                             <ui:TextBlock
                                 VerticalAlignment="Center"
diff --git a/src/RevitParamsChecker/Views/Controls/PageMenuControl.xaml b/src/RevitParamsChecker/Views/Controls/PageMenuControl.xaml
index b854dba29..df9589e42 100644
--- a/src/RevitParamsChecker/Views/Controls/PageMenuControl.xaml
+++ b/src/RevitParamsChecker/Views/Controls/PageMenuControl.xaml
@@ -44,13 +44,14 @@
                 ToolTip="{me:LocalizationSource PageMenu.Tooltip.Export}"
                 Command="{Binding ExportButtonCommand, ElementName=_this}"
                 Content="{ui:SymbolIcon Symbol=ArrowExportUp20}" />
-            <Label
+            <ui:TextBlock
                 Margin="8 0 0 0"
                 VerticalAlignment="Center"
                 Padding="0"
+                FontWeight="Bold"
                 FontSize="{DynamicResource ControlContentThemeFontSize}"
                 Visibility="{Binding ShowSaveChangesPrompt, ElementName=_this, Converter={StaticResource BoolToVisibilityConverter}}"
-                Content="{me:LocalizationSource PageMenu.SaveChangesPrompt}" />
+                Text="{me:LocalizationSource PageMenu.SaveChangesPrompt}" />
             <ui:TextBlock
                 Margin="8 0 0 0"
                 HorizontalAlignment="Left"
diff --git a/src/RevitParamsChecker/Views/MainWindow.xaml b/src/RevitParamsChecker/Views/MainWindow.xaml
index d4a736e5c..7718ba49d 100644
--- a/src/RevitParamsChecker/Views/MainWindow.xaml
+++ b/src/RevitParamsChecker/Views/MainWindow.xaml
@@ -45,6 +45,8 @@
     </i:Interaction.Behaviors>
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition
+                Height="Auto" />
             <RowDefinition
                 Height="*" />
             <RowDefinition
@@ -57,12 +59,13 @@
             Title="{me:LocalizationSource MainWindow.Title}" />
 
         <ui:NavigationView
-            Grid.Row="0"
+            Grid.Row="1"
             x:Name="_rootNavigationView"
             FrameMargin="0"
+            Margin="8 0"
             OpenPaneLength="200"
             IsPaneOpen="True"
-            PaneDisplayMode="Left"
+            PaneDisplayMode="Top"
             IsBackButtonVisible="Visible"
             IsPaneVisible="True"
             IsPaneToggleVisible="True"
@@ -71,9 +74,17 @@
 
             <ui:NavigationView.Header>
                 <StackPanel
-                    Margin="42 20 42 20">
+                    Margin="4 8  0 8">
                     <ui:BreadcrumbBar
-                        x:Name="_breadcrumbBar" />
+                        x:Name="_breadcrumbBar">
+                        <ui:BreadcrumbBar.ItemTemplate>
+                            <DataTemplate>
+                                <ui:TextBlock
+                                    FontTypography="Subtitle"
+                                    Text="{Binding Content}" />
+                            </DataTemplate>
+                        </ui:BreadcrumbBar.ItemTemplate>
+                    </ui:BreadcrumbBar>
                 </StackPanel>
             </ui:NavigationView.Header>
 
@@ -106,18 +117,18 @@
             x:Name="_rootContentDialog" />
 
         <StackPanel
-            Grid.Row="1"
+            Grid.Row="2"
             Orientation="Horizontal"
             HorizontalAlignment="Right">
 
             <ui:TextBlock
-                Margin="10"
+                Margin="8"
                 Foreground="Orange"
                 VerticalAlignment="Center"
                 Text="{Binding ErrorText}" />
 
             <ui:Button
-                Margin="10"
+                Margin="8"
                 Width="80"
                 Content="{me:LocalizationSource Close}"
                 IsCancel="True"
diff --git a/src/RevitParamsChecker/Views/Results/CheckResultControl.xaml b/src/RevitParamsChecker/Views/Results/CheckResultControl.xaml
index ed1837469..72eb2850c 100644
--- a/src/RevitParamsChecker/Views/Results/CheckResultControl.xaml
+++ b/src/RevitParamsChecker/Views/Results/CheckResultControl.xaml
@@ -157,16 +157,6 @@
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
 
-                        <DataGridTextColumn
-                            MinWidth="50"
-                            Width="150"
-                            IsReadOnly="True"
-                            Binding="{Binding FileName}">
-                            <DataGridTextColumn.Header>
-                                <ui:TextBlock
-                                    Text="{DynamicResource ResultsPage.FileNameHeader}" />
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
                         <DataGridTextColumn
                             MinWidth="50"
                             Width="150"
@@ -189,17 +179,6 @@
                             </DataGridTextColumn.Header>
                         </DataGridTextColumn>
 
-                        <DataGridTextColumn
-                            MinWidth="50"
-                            Width="150"
-                            IsReadOnly="True"
-                            Binding="{Binding RuleName}">
-                            <DataGridTextColumn.Header>
-                                <ui:TextBlock
-                                    Text="{DynamicResource ResultsPage.RuleNameHeader}" />
-                            </DataGridTextColumn.Header>
-                        </DataGridTextColumn>
-
                         <DataGridTextColumn
                             MinWidth="50"
                             Width="Auto"
@@ -210,14 +189,14 @@
                                     Text="{DynamicResource ResultsPage.StatusHeader}" />
                             </DataGridTextColumn.Header>
                         </DataGridTextColumn>
-
                         <DataGridTextColumn
                             MinWidth="50"
-                            Width="100"
-                            Binding="{Binding UserMark, UpdateSourceTrigger=PropertyChanged}">
+                            Width="150"
+                            IsReadOnly="True"
+                            Binding="{Binding FileName}">
                             <DataGridTextColumn.Header>
                                 <ui:TextBlock
-                                    Text="{DynamicResource ResultsPage.UserMarkHeader}" />
+                                    Text="{DynamicResource ResultsPage.FileNameHeader}" />
                             </DataGridTextColumn.Header>
                         </DataGridTextColumn>
                     </ui:DataGrid.Columns>
diff --git a/src/RevitParamsChecker/Views/Results/CheckResultsListControl.xaml b/src/RevitParamsChecker/Views/Results/CheckResultsListControl.xaml
index 4265692cd..70c71cfa0 100644
--- a/src/RevitParamsChecker/Views/Results/CheckResultsListControl.xaml
+++ b/src/RevitParamsChecker/Views/Results/CheckResultsListControl.xaml
@@ -57,7 +57,7 @@
                     <DataTemplate>
                         <DockPanel
                             Height="20"
-                            Margin="10 4"
+                            Margin="8 4"
                             VerticalAlignment="Center">
                             <ui:TextBlock
                                 VerticalAlignment="Center"
diff --git a/src/RevitParamsChecker/Views/Utils/NameEditorWindow.xaml b/src/RevitParamsChecker/Views/Utils/NameEditorWindow.xaml
index 1f265b83e..8006ec92d 100644
--- a/src/RevitParamsChecker/Views/Utils/NameEditorWindow.xaml
+++ b/src/RevitParamsChecker/Views/Utils/NameEditorWindow.xaml
@@ -44,12 +44,12 @@
 
         <DockPanel
             Grid.Row="1"
-            Margin="10 0"
+            Margin="8 0"
             LastChildFill="True">
             <Label
                 DockPanel.Dock="Left"
                 VerticalAlignment="Center"
-                Margin="10 0"
+                Margin="8 0"
                 FontSize="{DynamicResource ControlContentThemeFontSize}"
                 Content="{me:LocalizationSource NameEditor.Label}" />
             <ui:TextBox
@@ -65,19 +65,19 @@
             Orientation="Horizontal"
             HorizontalAlignment="Right">
             <ui:TextBlock
-                Margin="10"
+                Margin="8"
                 Text="{Binding ErrorText}"
                 Style="{StaticResource CustomErrorText}" />
             <ui:Button
                 Width="80"
-                Margin="10"
+                Margin="8"
                 IsDefault="True"
                 Appearance="Info"
                 Click="ButtonOk_Click"
                 Content="{me:LocalizationSource Ok}"
                 Command="{Binding Create}" />
             <ui:Button
-                Margin="10"
+                Margin="8"
                 Width="80"
                 IsCancel="true"
                 Click="ButtonCancel_Click"