diff --git a/SLC_LayoutEditor.sln b/SLC_LayoutEditor.sln
index 80bd381..70b2236 100644
--- a/SLC_LayoutEditor.sln
+++ b/SLC_LayoutEditor.sln
@@ -8,11 +8,14 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Production|Any CPU = Production|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{5ECF69D3-D893-4491-9B9B-8B6A892AD13F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5ECF69D3-D893-4491-9B9B-8B6A892AD13F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5ECF69D3-D893-4491-9B9B-8B6A892AD13F}.Production|Any CPU.ActiveCfg = Release|Any CPU
+		{5ECF69D3-D893-4491-9B9B-8B6A892AD13F}.Production|Any CPU.Build.0 = Release|Any CPU
 		{5ECF69D3-D893-4491-9B9B-8B6A892AD13F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5ECF69D3-D893-4491-9B9B-8B6A892AD13F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
diff --git a/SLC_LayoutEditor/App.xaml.cs b/SLC_LayoutEditor/App.xaml.cs
index 82e48e0..589d302 100644
--- a/SLC_LayoutEditor/App.xaml.cs
+++ b/SLC_LayoutEditor/App.xaml.cs
@@ -42,6 +42,18 @@ public partial class App : Application, IUIManager
 
         public static DateTime SessionStart { get; set; }
 
+        public static bool IsDebugMode
+        {
+            get
+            {
+#if DEBUG
+                return true;
+#else
+                return false;
+#endif
+            }
+        }
+
         public static bool IsDesignMode => DesignerProperties.GetIsInDesignMode(new DependencyObject());
 
         public static string DefaultEditorLayoutsPath => defaultEditorLayoutsPath;
@@ -67,6 +79,7 @@ public partial class App : Application, IUIManager
         [STAThread]
         public static void Main(string[] args)
         {
+            Logger.Default.ApplyLineLimit();
 #if DEBUG
             RunApp(args);
 #else
@@ -89,6 +102,7 @@ public static void Main(string[] args)
                     "This is awkward but...", MessageBoxButton.OK);
             }
 #endif
+            Logger.Default.ApplyLineLimit();
         }
 
         public void RefreshTheme()
diff --git a/SLC_LayoutEditor/Controls/AircraftLayoutsViewControl.xaml b/SLC_LayoutEditor/Controls/AircraftLayoutsViewControl.xaml
index edd6a55..95dd79b 100644
--- a/SLC_LayoutEditor/Controls/AircraftLayoutsViewControl.xaml
+++ b/SLC_LayoutEditor/Controls/AircraftLayoutsViewControl.xaml
@@ -248,7 +248,7 @@
                     </DockPanel>
                 </UniformGrid>
             </Border>
-            <Border Height="55" MinWidth="460" x:Name="card_layoutTitle"
+            <Border Height="55" MinWidth="460" x:Name="card_aircraftTitle"
                     IsEnabled="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:AircraftLayoutsViewControl}, Path=IsHeaderEnabled}">
                 <Border.Style>
                     <Style TargetType="Border" BasedOn="{StaticResource CardLayoutTitleStyle}">
@@ -263,7 +263,7 @@
                     </Style>
                 </Border.Style>
                 <DockPanel Margin="-1.5,0,-1.5,-1.5">
-                    <Button DockPanel.Dock="Left" Click="CreateTemplate_Click"
+                    <Button x:Name="btn_createTemplate" DockPanel.Dock="Left" Click="CreateTemplate_Click"
                             Style="{StaticResource MakeTemplateButtonStyle}"
                             Content="{StaticResource Add}"
                             ToolTip="Create a new template for this aircraft"
@@ -271,38 +271,40 @@
                             local:GuideAssist.Description="{StaticResource GuideCreateTemplateDescription}"
                             local:GuideAssist.HasGuide="True"
                             local:GuideAssist.TextPosition="Bottom"
-                            local:GuideAssist.RadiusOffset="-24"
+                            local:GuideAssist.RadiusOffset="-30"
                             local:GuideAssist.HighlightXOffset="-2"
                             Cursor="Help"
                             ContextMenu="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:AircraftLayoutsViewControl}, Path=GuideMenu}"
                             Margin="-10.5,-10.5,15.5,-8.5"
                             Padding="14.5,16,16.5,14.5"
                             Width="53" Height="53"/>
-                    <Button DockPanel.Dock="Right" Content="{DynamicResource Add}" Click="CreateLayout_Click"
-                        Style="{StaticResource AddDeckButtonStyle}"
-                        ToolTip="Create a new layout for this aircraft"
-                        local:GuideAssist.Title="{StaticResource GuideCreateLayoutTitle}"
-                        local:GuideAssist.Description="{StaticResource GuideCreateLayoutDescription}"
-                        local:GuideAssist.HasGuide="True"
-                        local:GuideAssist.TextPosition="Bottom"
-                        local:GuideAssist.RadiusOffset="-28"
-                        local:GuideAssist.HighlightXOffset="2"
-                        Cursor="Help"
-                        ContextMenu="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:AircraftLayoutsViewControl}, Path=GuideMenu}"
-                        Margin="15.5,-9,-6.5,-7"
-                        Padding="16.5,16,14.5,14.5"
-                        Width="53" Height="53"/>
-                    <Button DockPanel.Dock="Right" Content="{DynamicResource Trash}" Click="DeleteAircraft_Click"
-                        Style="{StaticResource ErrorCardButtonStyle}"
-                        ToolTip="Delete this aircraft and all of its layouts. This cannot be undone!"
-                        Margin="24,0,0,0"
-                        local:GuideAssist.Title="{StaticResource GuideDeleteAircraftTitle}"
-                        local:GuideAssist.Description="{StaticResource GuideDeleteAircraftDescription}"
-                        local:GuideAssist.HasGuide="True"
-                        local:GuideAssist.TextPosition="Bottom"
-                        local:GuideAssist.RadiusOffset="-24"
-                        Cursor="Help"
-                        ContextMenu="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:AircraftLayoutsViewControl}, Path=GuideMenu}"/>
+                    <Button x:Name="btn_createLayout" DockPanel.Dock="Right" Content="{DynamicResource Add}" Click="CreateLayout_Click"
+                            Style="{StaticResource AddDeckButtonStyle}"
+                            ToolTip="Create a new layout for this aircraft"
+                            local:GuideAssist.Title="{StaticResource GuideCreateLayoutTitle}"
+                            local:GuideAssist.Description="{StaticResource GuideCreateLayoutDescription}"
+                            local:GuideAssist.HasGuide="True"
+                            local:GuideAssist.TextPosition="Bottom"
+                            local:GuideAssist.RadiusOffset="-34"
+                            local:GuideAssist.HighlightXOffset="2"
+                            Cursor="Help"
+                            ContextMenu="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:AircraftLayoutsViewControl}, Path=GuideMenu}"
+                            Margin="15.5,-9,-6.5,-7"
+                            Padding="16.5,16,14.5,14.5"
+                            Width="53" Height="53"/>
+                    <Button x:Name="btn_deleteAircraft" DockPanel.Dock="Right" Content="{DynamicResource Trash}" Click="DeleteAircraft_Click"
+                            Style="{StaticResource ErrorCardButtonStyle}"
+                            ToolTip="Delete this aircraft and all of its layouts. This cannot be undone!"
+                            Margin="24,0,0,0"
+                            local:GuideAssist.Title="{StaticResource GuideDeleteAircraftTitle}"
+                            local:GuideAssist.Description="{StaticResource GuideDeleteAircraftDescription}"
+                            local:GuideAssist.HasGuide="True"
+                            local:GuideAssist.TextPosition="Bottom"
+                            local:GuideAssist.RadiusOffset="-36"
+                            local:GuideAssist.HighlightXOffset="1"
+                            local:GuideAssist.HighlightYOffset="-.5"
+                            Cursor="Help"
+                            ContextMenu="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:AircraftLayoutsViewControl}, Path=GuideMenu}"/>
                     <StackPanel Margin="52,0,0,0">
                         <TextBlock Margin="0,2,0,0" Text="Aircraft" Style="{StaticResource CabinLayoutTitleStyle}"/>
 
diff --git a/SLC_LayoutEditor/Controls/CabinLayoutControl.xaml b/SLC_LayoutEditor/Controls/CabinLayoutControl.xaml
index b524f86..c4bb68b 100644
--- a/SLC_LayoutEditor/Controls/CabinLayoutControl.xaml
+++ b/SLC_LayoutEditor/Controls/CabinLayoutControl.xaml
@@ -161,7 +161,7 @@
                             local:GuideAssist.Description="{StaticResource GuideMakeTemplateDescription}"
                             local:GuideAssist.HasGuide="True"
                             local:GuideAssist.TextPosition="Bottom"
-                            local:GuideAssist.RadiusOffset="-24"
+                            local:GuideAssist.RadiusOffset="-30"
                             local:GuideAssist.HighlightXOffset="-2"
                             Cursor="Help"
                             ContextMenu="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CabinLayoutControl}, Path=GuideMenu}"
@@ -186,7 +186,7 @@
                             local:GuideAssist.Description="{StaticResource GuideAddDeckDescription}"
                             local:GuideAssist.HasGuide="True"
                             local:GuideAssist.TextPosition="Bottom"
-                            local:GuideAssist.RadiusOffset="-28"
+                            local:GuideAssist.RadiusOffset="-34"
                             local:GuideAssist.HighlightXOffset="2"
                             Cursor="Help"
                             ContextMenu="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CabinLayoutControl}, Path=GuideMenu}"
@@ -199,7 +199,8 @@
                             local:GuideAssist.Description="{StaticResource GuideReloadLayoutDescription}"
                             local:GuideAssist.HasGuide="True"
                             local:GuideAssist.TextPosition="Bottom"
-                            local:GuideAssist.RadiusOffset="-20"
+                            local:GuideAssist.RadiusOffset="-32"
+                            local:GuideAssist.HighlightYOffset="-.5"
                             Cursor="Help"
                             ContextMenu="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CabinLayoutControl}, Path=GuideMenu}">
                     <Button.Style>
@@ -219,7 +220,9 @@
                             local:GuideAssist.Description="{StaticResource GuideDeleteLayoutDescription}"
                             local:GuideAssist.HasGuide="True"
                             local:GuideAssist.TextPosition="Bottom"
-                            local:GuideAssist.RadiusOffset="-24"
+                            local:GuideAssist.RadiusOffset="-36"
+                            local:GuideAssist.HighlightXOffset="1"
+                            local:GuideAssist.HighlightYOffset="-.5"
                             Cursor="Help"
                             ContextMenu="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CabinLayoutControl}, Path=GuideMenu}">
                     <Button.Style>
diff --git a/SLC_LayoutEditor/Controls/CabinLayoutControl.xaml.cs b/SLC_LayoutEditor/Controls/CabinLayoutControl.xaml.cs
index 58e7c01..167ff9a 100644
--- a/SLC_LayoutEditor/Controls/CabinLayoutControl.xaml.cs
+++ b/SLC_LayoutEditor/Controls/CabinLayoutControl.xaml.cs
@@ -23,7 +23,6 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Tasty.Logging;
 using Tasty.ViewModel.Communication;
 
@@ -99,7 +98,7 @@ private static string GetCabinLayoutValueForLog(CabinLayout cabinLayout)
         {
             return cabinLayout != null ?
                 string.Format("{0} (type: {1})", cabinLayout.LayoutName, cabinLayout.IsTemplate ? "template" : "layout") :
-                "Unset";
+                "<UNSET>";
         }
         #endregion
 
@@ -221,7 +220,7 @@ public CabinLayoutControl()
             }, ViewModelMessage.Deselect_Slots);
         }
 
-        public void GenerateThumbnailForLayout(bool overwrite = false)
+        public void GenerateThumbnailsForLayout(bool overwrite = false)
         {
             if (CabinLayout != null)
             {
@@ -232,7 +231,8 @@ public void GenerateThumbnailForLayout(bool overwrite = false)
                 {
                     deckLayoutControl.GenerateThumbnailForDeck(CabinLayout.ThumbnailDirectory, overwrite);
                 }
-                Logger.Default.WriteLog("{0} saved successfully!", CabinLayout.IsTemplate ? "template" : "layout");
+
+                CabinLayout.CheckThumbnailStore();
             }
         }
 
@@ -433,13 +433,13 @@ private void AddCabinDeck_Click(object sender, RoutedEventArgs e)
             }
             else
             {
-                ShowDeckSizeDialog(12, 7);
+                ShowDeckSizeDialog(7, 15);
             }
         }
 
         private void ShowDeckSizeDialog(int columns, int rows)
         {
-            SpecifyDeckSizeDialog dialog = new SpecifyDeckSizeDialog(columns, rows);
+            SpecifyDeckSizeDialog dialog = new SpecifyDeckSizeDialog(rows, columns);
 
             dialog.DialogClosing += SpecifyDeckSize_DialogClosing;
             dialog.ShowDialog();
@@ -460,6 +460,11 @@ private void CreateDeck_DialogClosing(object sender, DialogClosingEventArgs e)
 
         private void SpecifyDeckSize_DialogClosing(object sender, DialogClosingEventArgs e)
         {
+            if (sender is IDialog dialog)
+            {
+                dialog.DialogClosing -= SpecifyDeckSize_DialogClosing;
+            }
+
             if (e.DialogResult == DialogResultType.OK && e.Data is int[] deckData)
             {
                 CreateCabinDeck(deckData[0], deckData[1]);
@@ -570,7 +575,7 @@ private void deck_scroll_SizeChanged(object sender, SizeChangedEventArgs e)
 
         private void container_decks_Loaded(object sender, RoutedEventArgs e)
         {
-            GenerateThumbnailForLayout();
+            GenerateThumbnailsForLayout();
         }
 
         private void RefreshScrollBarVisibleFlags()
diff --git a/SLC_LayoutEditor/Controls/CabinLayoutTile.xaml.cs b/SLC_LayoutEditor/Controls/CabinLayoutTile.xaml.cs
index 26e8a7b..c64a6ef 100644
--- a/SLC_LayoutEditor/Controls/CabinLayoutTile.xaml.cs
+++ b/SLC_LayoutEditor/Controls/CabinLayoutTile.xaml.cs
@@ -48,7 +48,7 @@ private static void OnCabinLayoutChanged(DependencyObject sender, DependencyProp
             {
                 CabinLayoutTileViewModel vm = (CabinLayoutTileViewModel)control.DataContext;
                 vm.CabinLayout = control.CabinLayout;
-                vm.LoadThumbnails(control.CabinLayout.ThumbnailDirectory);
+                vm.LoadThumbnails();
             }
         }
 
@@ -78,10 +78,17 @@ public CabinLayoutTile()
 
             Mediator.Instance.Register(o =>
             {
-                if (o is CabinLayout updated && updated.Guid == CabinLayout.Guid)
+                if (o is LayoutTileRefreshData data && data.CabinLayout != null && data.CabinLayout.Guid == CabinLayout.Guid)
                 {
-                    vm.CabinLayout = updated;
-                    vm.GenerateThumbnails(updated);
+                    vm.CabinLayout = data.CabinLayout;
+                    if (!data.IsLoadingOnly)
+                    {
+                        vm.GenerateThumbnails();
+                    }
+                    else
+                    {
+                        vm.LoadThumbnails();
+                    }
                 }
             }, ViewModelMessage.Layout_Tile_RefreshData);
         }
@@ -100,7 +107,7 @@ private void NextThumbnail_Click(object sender, RoutedEventArgs e)
 
         private void GenerateThumbnail_Click(object sender, RoutedEventArgs e)
         {
-            vm.GenerateThumbnails(CabinLayout);
+            vm.GenerateThumbnails();
         }
 
         private void DeleteLayoutTemplate_Click(object sender, RoutedEventArgs e)
diff --git a/SLC_LayoutEditor/Controls/IssueTracker.xaml b/SLC_LayoutEditor/Controls/IssueTracker.xaml
index 0151e99..34ebe8e 100644
--- a/SLC_LayoutEditor/Controls/IssueTracker.xaml
+++ b/SLC_LayoutEditor/Controls/IssueTracker.xaml
@@ -59,8 +59,6 @@
                                          InvalidSlots="{Binding ActiveLayout.DuplicateSeats}"
                                          ShowEye="True" ShowProblemsChanged="DuplicateSeats_ShowIssuesChanged"
                                          ShowProblems="{Binding ShowDuplicateSeatIssues}"/>
-
-                <Separator Margin="0,4"/>
                 <local:LayoutProblemText ValidText="No duplicate doors"
                                          InvalidText="{Binding ActiveLayout.DuplicateDoors.Count, StringFormat={}{0} duplicate doors found!}"
                                          IsValid="{Binding ActiveLayout.HasNoDuplicateDoors}"
@@ -72,6 +70,7 @@
                                          ShowAutoFix="True"
                                          AutoFixApplying="DuplicateDoors_AutoFixApplying"
                                          Description="Make sure that each door has a unique number across all decks"/>
+                <Separator Margin="0,4"/>
                 <local:LayoutProblemText ValidText="Less than 100 doors/bays"
                                          IsValid="{Binding ActiveLayout.HasNoDoorSurplus}"
                                          ShowEye="False"
diff --git a/SLC_LayoutEditor/Controls/IssueTracker.xaml.cs b/SLC_LayoutEditor/Controls/IssueTracker.xaml.cs
index 2997eb5..08b82ac 100644
--- a/SLC_LayoutEditor/Controls/IssueTracker.xaml.cs
+++ b/SLC_LayoutEditor/Controls/IssueTracker.xaml.cs
@@ -115,11 +115,20 @@ private void StairwayPositions_AutoFixApplying(object sender, AutoFixApplyingEve
         {
             if (e.Target is CabinLayout target)
             {
+                string message;
+
                 AutoFixResult result = target.FixStairwayPositions();
 
-                string message = result.FailCount > 0 ?
-                    string.Format("{0} non-aisle slots have been overridden while fixing {1} stairway positions.", result.FailCount, result.SuccessCount) :
-                    string.Format("Fixed {0} stairway positions.", result.SuccessCount);
+                if (!result.WasAborted)
+                {
+                    message = result.FailCount > 0 ?
+                        string.Format("{0} non-aisle slots have been overridden while fixing {1} stairway positions.", result.FailCount, result.SuccessCount) :
+                        string.Format("Fixed {0} stairway positions.", result.SuccessCount);
+                }
+                else
+                {
+                    message = "Auto-fix was cancelled by the editor:\nAt least 1 stairway is required for the auto-fix to work.";
+                }
 
                 result.SendNotification(message);
             }
diff --git a/SLC_LayoutEditor/Controls/LayoutProblemText.xaml b/SLC_LayoutEditor/Controls/LayoutProblemText.xaml
index 59e525b..2b3c4bd 100644
--- a/SLC_LayoutEditor/Controls/LayoutProblemText.xaml
+++ b/SLC_LayoutEditor/Controls/LayoutProblemText.xaml
@@ -88,11 +88,6 @@
             <Style TargetType="TextBlock" BasedOn="{StaticResource LayoutProblemTextStyle}">
                 <Setter Property="Text" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DockPanel}, Path=ValidText}"/>
                 <Style.Triggers>
-                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:LayoutProblemText}, Path=IsRequired, UpdateSourceTrigger=PropertyChanged}"
-                                 Value="False">
-                        <Setter Property="Foreground" Value="{StaticResource DisabledColorBrush}"/>
-                        <Setter Property="Text" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:LayoutProblemText}, Path=NotRequiredText}"/>
-                    </DataTrigger>
                     <MultiDataTrigger>
                         <MultiDataTrigger.Conditions>
                             <Condition Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:LayoutProblemText}, Path=IsValid, UpdateSourceTrigger=PropertyChanged}"
@@ -113,6 +108,11 @@
                         <Setter Property="Foreground" Value="{StaticResource WarnForegroundColorBrush}"/>
                         <Setter Property="Text" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:LayoutProblemText}, Path=InvalidText}"/>
                     </MultiDataTrigger>
+                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:LayoutProblemText}, Path=IsRequired, UpdateSourceTrigger=PropertyChanged}"
+                                 Value="False">
+                        <Setter Property="Foreground" Value="{StaticResource ForegroundSecondaryColorBrush}"/>
+                        <Setter Property="Text" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:LayoutProblemText}, Path=NotRequiredText}"/>
+                    </DataTrigger>
                 </Style.Triggers>
             </Style>
         </TextBlock.Style>
diff --git a/SLC_LayoutEditor/Controls/Patchnote.xaml b/SLC_LayoutEditor/Controls/Patchnote.xaml
index c3c645a..b7029d7 100644
--- a/SLC_LayoutEditor/Controls/Patchnote.xaml
+++ b/SLC_LayoutEditor/Controls/Patchnote.xaml
@@ -24,15 +24,19 @@
     </StackPanel>
     <TextBlock Text="{Binding PatchDate, ElementName=patchnote, FallbackValue=Release date}" Margin="12,0" FontSize="10.667" 
                FontStyle="Italic" DockPanel.Dock="Top" Foreground="{DynamicResource ForegroundSecondaryColorBrush}"/>
-    <DataGrid Width="576" ItemsSource="{Binding ElementName=patchnote, Path=Entries}" Margin="0,16,0,0">
-        <DataGrid.Columns>
-            <DataGridTemplateColumn>
-                <DataGridTemplateColumn.CellTemplate>
-                    <DataTemplate>
-                        <ContentPresenter Content="{Binding}"/>
-                    </DataTemplate>
-                </DataGridTemplateColumn.CellTemplate>
-            </DataGridTemplateColumn>
-        </DataGrid.Columns>
-    </DataGrid>
+    <ScrollViewer ScrollViewer.VerticalScrollBarVisibility="Auto">
+        <DataGrid Width="586" ItemsSource="{Binding ElementName=patchnote, Path=Entries}" Margin="0,16,0,0"
+                  HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"
+                  PreviewMouseWheel="Changes_PreviewMouseWheel" Grid.IsSharedSizeScope="True">
+            <DataGrid.Columns>
+                <DataGridTemplateColumn>
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <ContentPresenter Content="{Binding}"/>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
+            </DataGrid.Columns>
+        </DataGrid>
+    </ScrollViewer>
 </DockPanel>
diff --git a/SLC_LayoutEditor/Controls/Patchnote.xaml.cs b/SLC_LayoutEditor/Controls/Patchnote.xaml.cs
index e19fb5a..5ea8a02 100644
--- a/SLC_LayoutEditor/Controls/Patchnote.xaml.cs
+++ b/SLC_LayoutEditor/Controls/Patchnote.xaml.cs
@@ -165,5 +165,18 @@ public string[] Patchnotes
         public static readonly DependencyProperty PatchnotesProperty =
             DependencyProperty.Register("Patchnotes", typeof(string[]), typeof(Patchnote), new PropertyMetadata(null));
         #endregion
+
+        private void Changes_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
+        {
+            if (!e.Handled)
+            {
+                e.Handled = true;
+                var eventArg = new MouseWheelEventArgs(e.MouseDevice, e.Timestamp, e.Delta);
+                eventArg.RoutedEvent = UIElement.MouseWheelEvent;
+                eventArg.Source = sender;
+                var parent = ((Control)sender).Parent as UIElement;
+                parent.RaiseEvent(eventArg);
+            }
+        }
     }
 }
diff --git a/SLC_LayoutEditor/Controls/PatchnoteEntry.xaml b/SLC_LayoutEditor/Controls/PatchnoteEntry.xaml
index fe80387..9f763e5 100644
--- a/SLC_LayoutEditor/Controls/PatchnoteEntry.xaml
+++ b/SLC_LayoutEditor/Controls/PatchnoteEntry.xaml
@@ -1,12 +1,16 @@
-<DockPanel x:Class="SLC_LayoutEditor.Controls.PatchnoteEntry"
+<Grid x:Class="SLC_LayoutEditor.Controls.PatchnoteEntry"
            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
            xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
            xmlns:local="clr-namespace:SLC_LayoutEditor.Controls"
-           mc:Ignorable="d" Margin="0,0,0,6" Width="576">
+           mc:Ignorable="d" Margin="0,0,0,6" Width="586">
+    <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" SharedSizeGroup="change_type"/>
+        <ColumnDefinition Width="*"/>
+    </Grid.ColumnDefinitions>
     <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PatchnoteEntry}, Path=Intro, StringFormat={}{0}:}" 
-               FontWeight="SemiBold" DockPanel.Dock="Left"
+               FontWeight="SemiBold" HorizontalAlignment="Right"
                Foreground="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PatchnoteEntry}, Path=IntroForeground}"
                Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PatchnoteEntry}, Path=Intro, Converter={StaticResource NotNullToVisibilityConverter}}">
         <TextBlock.Style>
@@ -19,12 +23,14 @@
             </Style>
         </TextBlock.Style>
     </TextBlock>
-    <Border Style="{StaticResource ChipStyle}" Background="{StaticResource TemplatingModeBorderPressedBrush}"
-            DockPanel.Dock="Left" Margin="4,0,0,-1" VerticalAlignment="Center" Padding="6,1,6,3"
-            Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PatchnoteEntry}, Path=HasBetaTag, Converter={StaticResource BooleanToVisibilityConverter}}">
-        <TextBlock Text="(BETA)" FontWeight="Bold" FontStyle="Italic" FontSize="10"
+    <DockPanel Grid.Column="1">
+        <Border Style="{StaticResource ChipStyle}" Background="{StaticResource TemplatingModeBorderPressedBrush}"
+                Margin="4,0,0,-1" Padding="6,1,6,3" VerticalAlignment="Center"
+                Visibility="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PatchnoteEntry}, Path=HasBetaTag, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <TextBlock Text="(BETA)" FontWeight="Bold" FontStyle="Italic" FontSize="10"
                    Foreground="{StaticResource BackgroundDarkBrush}"/>
-    </Border>
-    <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PatchnoteEntry}, Path=Content}"
+        </Border>
+        <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PatchnoteEntry}, Path=Content}"
                TextWrapping="WrapWithOverflow" Margin="4,0,0,0"/>
-</DockPanel>
+    </DockPanel>
+</Grid>
diff --git a/SLC_LayoutEditor/Controls/PatchnoteEntry.xaml.cs b/SLC_LayoutEditor/Controls/PatchnoteEntry.xaml.cs
index ba024f6..05d7857 100644
--- a/SLC_LayoutEditor/Controls/PatchnoteEntry.xaml.cs
+++ b/SLC_LayoutEditor/Controls/PatchnoteEntry.xaml.cs
@@ -18,7 +18,7 @@ namespace SLC_LayoutEditor.Controls
     /// <summary>
     /// Interaction logic for PatchnoteEntry.xaml
     /// </summary>
-    public partial class PatchnoteEntry : DockPanel
+    public partial class PatchnoteEntry : Grid
     {
         public string Intro
         {
diff --git a/SLC_LayoutEditor/Controls/TodoList.xaml b/SLC_LayoutEditor/Controls/TodoList.xaml
index 6144957..332aa34 100644
--- a/SLC_LayoutEditor/Controls/TodoList.xaml
+++ b/SLC_LayoutEditor/Controls/TodoList.xaml
@@ -47,9 +47,6 @@
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
                                 <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.IsSharedSizeScope="True">
-                                    <Path Data="{StaticResource CheckOutline}" DockPanel.Dock="Right" Height="18" Stretch="Uniform" Margin="8,2,0,0"
-                                          Fill="{DynamicResource ButtonBorderColorBrush}" VerticalAlignment="Center"
-                                          Visibility="{Binding IsComplete, Converter={StaticResource BooleanToVisibilityConverter}}"/>
                                     <TextBlock FontSize="13" VerticalAlignment="Center" Margin="8,0,0,0"
                                                Visibility="{Binding HasTargetAmount, Converter={StaticResource BooleanToVisibilityConverter}}">
                                         <TextBlock.Style>
@@ -66,6 +63,9 @@
                                         </TextBlock.Style>
                                         <Run Text="{Binding Current}"/><Run Text="{Binding Amount, Mode=OneWay, StringFormat={}/{0}}"/>
                                     </TextBlock>
+                                    <Path Data="{StaticResource CheckOutline}" Height="18" Stretch="Uniform" Margin="8,2,0,0"
+                                          Fill="{DynamicResource ButtonBorderColorBrush}" VerticalAlignment="Center"
+                                          Visibility="{Binding IsComplete, Converter={StaticResource BooleanToVisibilityConverter}}"/>
                                 </StackPanel>
                                 <TextBlock FontSize="13" VerticalAlignment="Center" Margin="0,0,32,0">
                                     <TextBlock.Style>
diff --git a/SLC_LayoutEditor/Core/AutoFix/AutoFixResult.cs b/SLC_LayoutEditor/Core/AutoFix/AutoFixResult.cs
index 447f177..8f784e9 100644
--- a/SLC_LayoutEditor/Core/AutoFix/AutoFixResult.cs
+++ b/SLC_LayoutEditor/Core/AutoFix/AutoFixResult.cs
@@ -16,6 +16,8 @@ public class AutoFixResult
         private string failText;
         private int failCount;
 
+        private bool wasAborted;
+
         private string notificationTitle;
 
         public bool AllSucceeded => failCount == 0;
@@ -26,6 +28,23 @@ public class AutoFixResult
 
         public int TotalCount => successCount + failCount;
 
+        public bool WasAborted => wasAborted;
+
+        public AutoFixResult(string resultText, string successText, string failText, 
+            string notificationTitle)
+        {
+            //this.floor = floor;
+            this.resultText = resultText;
+            this.successText = successText;
+            this.failText = failText;
+            this.notificationTitle = notificationTitle;
+        }
+
+        public void Abort()
+        {
+            wasAborted = true;
+        }
+
         public void CountSuccess()
         {
             successCount++;
@@ -46,19 +65,9 @@ public void CountFails(int amount)
             failCount += amount;
         }
 
-        public AutoFixResult(string resultText, string successText, string failText, 
-            string notificationTitle)
-        {
-            //this.floor = floor;
-            this.resultText = resultText;
-            this.successText = successText;
-            this.failText = failText;
-            this.notificationTitle = notificationTitle;
-        }
-
         public void SendNotification(string message)
         {
-            Notification.MakeTimedNotification(notificationTitle, message, 15000, FixedValues.ICON_AUTO_FIX);
+            Notification.MakeTimedNotification(!wasAborted ? notificationTitle : "Auto-fix cancelled", message, 15000, FixedValues.ICON_AUTO_FIX);
         }
 
         public override string ToString()
diff --git a/SLC_LayoutEditor/Core/Cabin/CabinDeck.cs b/SLC_LayoutEditor/Core/Cabin/CabinDeck.cs
index 665ba86..abcd81c 100644
--- a/SLC_LayoutEditor/Core/Cabin/CabinDeck.cs
+++ b/SLC_LayoutEditor/Core/Cabin/CabinDeck.cs
@@ -43,6 +43,8 @@ public class CabinDeck : ViewModelBase, IDisposable
         private int cachedColumns;
         private int cachedRows;
 
+        private readonly bool eventsHooked;
+
         public double Width { get; set; }
 
         public double Height { get; set; }
@@ -129,9 +131,16 @@ public bool AreSeatsReachableByService
         {
             get
             {
-                IEnumerable<int> coveredRows = GetRowsCoveredByService();
-                IEnumerable<int> rowsWithSeats = GetRowsWithSeats();
-                return rowsWithSeats.All(x => coveredRows.Contains(x));
+                if (AreKitchensValid)
+                {
+                    IEnumerable<int> coveredRows = GetRowsCoveredByService();
+                    IEnumerable<int> rowsWithSeats = GetRowsWithSeats();
+                    return rowsWithSeats.All(x => coveredRows.Contains(x));
+                }
+                else
+                {
+                    return true;
+                }
             }
         }
 
@@ -309,7 +318,7 @@ public CabinDeck(string deckData, int floor, bool isThumbnailMode = false)
 
             if (!isThumbnailMode)
             {
-                RefreshPathGrid();
+                //RefreshPathGrid();
             }
             currentHash = Util.GetSHA256Hash(ToFileString());
         }
@@ -476,6 +485,7 @@ public void AddCabinSlot(CabinSlot cabinSlot, bool hookEvents = true)
         {
             if (hookEvents)
             {
+                cabinSlot.IsChangedEventHooked = true;
                 cabinSlot.Changed += CabinSlot_CabinSlotChanged;
             }
             CabinSlots.Add(cabinSlot);
@@ -486,7 +496,10 @@ public void AddCabinSlot(CabinSlot cabinSlot, bool hookEvents = true)
         public void RemoveCabinSlot(CabinSlot cabinSlot)
         {
             cabinSlot.MarkForRemoval();
-            cabinSlot.Changed -= CabinSlot_CabinSlotChanged;
+            if (cabinSlot.IsChangedEventHooked)
+            {
+                cabinSlot.Changed -= CabinSlot_CabinSlotChanged;
+            }
             CabinSlots.Remove(cabinSlot);
             InvokePropertyChanged(nameof(DisplayColumns));
             InvokePropertyChanged(nameof(DisplayRows));
@@ -941,7 +954,7 @@ private void CheckUnreachableSlots()
             IEnumerable<CabinSlot> unreachableSlots = mCabinSlots.Where(x => x.IsInteractable && !x.IsReachable(this));
             sw.Stop();
             Logger.Default.WriteLog("Check complete, found {0}/{1} unreachable slots in {2} seconds",
-                unreachableSlots.Count(), interactableCount, Math.Round((decimal)sw.ElapsedMilliseconds, 3));
+                unreachableSlots.Count(), interactableCount, sw.GetElapsedSecondsForLog());
 
             foreach (var diff in unreachableSlots.GetDiff(UnreachableSlots))
             {
diff --git a/SLC_LayoutEditor/Core/Cabin/CabinLayout.cs b/SLC_LayoutEditor/Core/Cabin/CabinLayout.cs
index 9e9fccd..21f2edf 100644
--- a/SLC_LayoutEditor/Core/Cabin/CabinLayout.cs
+++ b/SLC_LayoutEditor/Core/Cabin/CabinLayout.cs
@@ -16,6 +16,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Forms;
+using System.Windows.Media;
 using Tasty.Logging;
 using Tasty.ViewModel;
 using Tasty.ViewModel.Communication;
@@ -149,7 +150,8 @@ public IEnumerable<CabinSlot> InvalidSlots
 
         public IEnumerable<CabinSlot> InvalidStairways => InvalidSlots?.Where(invalidStairwaysCondition);
             
-        public bool StairwaysValid => !InvalidStairways?.Any() ?? true;
+        public bool StairwaysValid => !HasMultipleDecks || mCabinDecks.Sum(x => x.CabinSlots.Where(y => y.Type == CabinSlotType.Stairway).Count()) > 0 ?
+                        !InvalidStairways?.Any() ?? true : false;
 
         public bool HasMultipleDecks => mCabinDecks.Count > 1;
 
@@ -170,7 +172,8 @@ public IEnumerable<CabinSlot> InvalidSlots
 
         public string StairwayErrorMessage
         {
-            get => CabinDecks?.Count > 1 ? "Invalid stairway positions!" :
+            get => CabinDecks?.Count > 1 ? (mCabinDecks.Sum(x => x.CabinSlots.Where(y => y.Type == CabinSlotType.Stairway).Count()) > 0 ?
+                "Invalid stairway positions!" : "Missing stairway!") :
                 "Stairway can be removed!";
         }
 
@@ -509,9 +512,6 @@ public void RemoveCabinDeck(CabinDeck cabinDeck)
 
             cabinDeck.CabinSlotsChanged -= Deck_CabinSlotsChanged;
 
-            string thumbnailPath = Path.Combine(ThumbnailDirectory, cabinDeck.ThumbnailFileName);
-
-            Util.SafeDeleteFile(thumbnailPath);
             mCabinDecks.Remove(cabinDeck);
 
             if (index < mCabinDecks.Count) // Shift floor numbers for each deck after the removed
@@ -524,6 +524,21 @@ public void RemoveCabinDeck(CabinDeck cabinDeck)
             OnCabinDeckCountChanged(new CabinDeckChangedEventArgs(cabinDeck, true));
         }
 
+        public void CheckThumbnailStore()
+        {
+            // Check if there are more thumbnails than decks
+            IEnumerable<FileInfo> existingThumbnails = new DirectoryInfo(ThumbnailDirectory).EnumerateFiles();
+            int cabinDeckCount = CabinDecks.Count;
+            if (existingThumbnails.Count() > cabinDeckCount)
+            {
+                foreach (FileInfo existingThumbnail in existingThumbnails.Skip(cabinDeckCount))
+                {
+                    Util.MoveFileToDelete(existingThumbnail);
+                }
+                Logger.Default.WriteLog("Cleaned up thumbnails for non-existing cabin decks for {0} \"{1}\"", IsTemplate ? "template" : "layout", LayoutName);
+            }
+        }
+
         public CabinLayout MakeTemplate(MakeTemplateDialogViewModel data, string layoutsPath)
         {
             FileInfo layoutFile = new FileInfo(Path.Combine(layoutsPath, data.Name + ".txt"));
@@ -611,7 +626,7 @@ public void SaveLayout()
             File.WriteAllText(FilePath, ToLayoutFile());
             Logger.Default.WriteLog("{0} saved successfully!", IsTemplate ? "template" : "layout");
             OnCabinSlotsChanged(EventArgs.Empty);
-            Mediator.Instance.NotifyColleagues(ViewModelMessage.Layout_Tile_RefreshData, this);
+            Mediator.Instance.NotifyColleagues(ViewModelMessage.Layout_Tile_RefreshData, new LayoutTileRefreshData(this, false));
         }
 
         public AutoFixResult FixStairwayPositions()
@@ -621,72 +636,79 @@ public AutoFixResult FixStairwayPositions()
             AutoFixResult autoFixResult = new AutoFixResult("Stairway fix applied", "Stairways fixed",
                 "Non-aisle slots overwritten", "Fixed stairways");
 
-            if (HasMultipleDecks)
+            if (firstDeckWithStairs != null)
             {
-                ToggleIssueChecking(false);
-                Dictionary<int, IEnumerable<CabinSlot>> changesPerFloor = new Dictionary<int, IEnumerable<CabinSlot>>();
-
-                CabinDeck previousDeck = null;
-                CabinDeck nextDeck = mCabinDecks.Skip(1).FirstOrDefault();
-                bool hasPreviousDeckStairways = false;
-                foreach (CabinDeck cabinDeck in mCabinDecks)
+                if (HasMultipleDecks)
                 {
-                    foreach (CabinSlot cabinSlot in cabinDeck.CabinSlots.Where(x => x.Type == CabinSlotType.Stairway))
+                    ToggleIssueChecking(false);
+                    Dictionary<int, IEnumerable<CabinSlot>> changesPerFloor = new Dictionary<int, IEnumerable<CabinSlot>>();
+
+                    CabinDeck previousDeck = null;
+                    CabinDeck nextDeck = mCabinDecks.Skip(1).FirstOrDefault();
+                    bool hasPreviousDeckStairways = false;
+                    foreach (CabinDeck cabinDeck in mCabinDecks)
                     {
-                        if (previousDeck != null) // Check stairway connections above
+                        foreach (CabinSlot cabinSlot in cabinDeck.CabinSlots.Where(x => x.Type == CabinSlotType.Stairway))
                         {
-                            CabinSlot slotBelow = previousDeck.GetSlotAtPosition(cabinSlot.Row, cabinSlot.Column);
-
-                            if (slotBelow?.Type != CabinSlotType.Stairway)
+                            if (previousDeck != null) // Check stairway connections above
                             {
-                                if (cabinSlot.Type != CabinSlotType.Aisle)
+                                CabinSlot slotBelow = previousDeck.GetSlotAtPosition(cabinSlot.Row, cabinSlot.Column);
+
+                                if (slotBelow?.Type != CabinSlotType.Stairway)
                                 {
-                                    autoFixResult.CountFail();
-                                }
+                                    if (cabinSlot.Type != CabinSlotType.Aisle)
+                                    {
+                                        autoFixResult.CountFail();
+                                    }
 
-                                cabinSlot.Type = hasPreviousDeckStairways ?
-                                    CabinSlotType.Aisle : CabinSlotType.Stairway;
+                                    cabinSlot.Type = hasPreviousDeckStairways ?
+                                        CabinSlotType.Aisle : CabinSlotType.Stairway;
 
-                                autoFixResult.CountSuccess();
+                                    autoFixResult.CountSuccess();
+                                }
                             }
-                        }
-                        if (nextDeck != null)
-                        {
-                            CabinSlot slotAbove = nextDeck.GetSlotAtPosition(cabinSlot.Row, cabinSlot.Column);
-
-                            if (slotAbove?.Type != CabinSlotType.Stairway)
+                            if (nextDeck != null)
                             {
-                                if (slotAbove.Type != CabinSlotType.Aisle)
+                                CabinSlot slotAbove = nextDeck.GetSlotAtPosition(cabinSlot.Row, cabinSlot.Column);
+
+                                if (slotAbove?.Type != CabinSlotType.Stairway)
                                 {
-                                    autoFixResult.CountFail();
+                                    if (slotAbove.Type != CabinSlotType.Aisle)
+                                    {
+                                        autoFixResult.CountFail();
+                                    }
+                                    slotAbove.Type = CabinSlotType.Stairway;
+                                    autoFixResult.CountSuccess();
                                 }
-                                slotAbove.Type = CabinSlotType.Stairway;
-                                autoFixResult.CountSuccess();
                             }
                         }
+
+                        IEnumerable<CabinSlot> changedSlots = cabinDeck.CabinSlots.Where(x => x.CollectForHistory);
+                        if (changedSlots.Any())
+                        {
+                            changesPerFloor.Add(cabinDeck.Floor, changedSlots);
+                        }
+                        previousDeck = cabinDeck;
+                        hasPreviousDeckStairways = cabinDeck.CabinSlots.Where(x => x.Type == CabinSlotType.Stairway).Any();
+                        nextDeck = mCabinDecks.Skip(mCabinDecks.IndexOf(nextDeck) + 1).FirstOrDefault();
                     }
 
-                    IEnumerable<CabinSlot> changedSlots = cabinDeck.CabinSlots.Where(x => x.CollectForHistory);
-                    if (changedSlots.Any())
+                    CabinHistory.Instance.RecordChanges(changesPerFloor, AutomationMode.AutoFix_Stairways);
+                    ToggleIssueChecking(true);
+                }
+                else
+                {
+                    foreach (CabinSlot cabinSlot in firstDeckWithStairs.CabinSlots.Where(x => x.Type == CabinSlotType.Stairway))
                     {
-                        changesPerFloor.Add(cabinDeck.Floor, changedSlots);
+                        cabinSlot.Type = CabinSlotType.Aisle;
+                        cabinSlot.SlotIssues.ToggleIssue(CabinSlotIssueType.STAIRWAY, false);
+                        autoFixResult.CountSuccess();
                     }
-                    previousDeck = cabinDeck;
-                    hasPreviousDeckStairways = cabinDeck.CabinSlots.Where(x => x.Type == CabinSlotType.Stairway).Any();
-                    nextDeck = mCabinDecks.Skip(mCabinDecks.IndexOf(nextDeck) + 1).FirstOrDefault();
                 }
-
-                CabinHistory.Instance.RecordChanges(changesPerFloor, AutomationMode.AutoFix_Stairways);
-                ToggleIssueChecking(true);
             }
             else
             {
-                foreach (CabinSlot cabinSlot in firstDeckWithStairs.CabinSlots.Where(x => x.Type == CabinSlotType.Stairway))
-                {
-                    cabinSlot.Type = CabinSlotType.Aisle;
-                    cabinSlot.SlotIssues.ToggleIssue(CabinSlotIssueType.STAIRWAY, false);
-                    autoFixResult.CountSuccess();
-                }
+                autoFixResult.Abort();
             }
 
             return autoFixResult;
diff --git a/SLC_LayoutEditor/Core/Cabin/CabinLayoutSet.cs b/SLC_LayoutEditor/Core/Cabin/CabinLayoutSet.cs
index 96f1d2e..65ae39a 100644
--- a/SLC_LayoutEditor/Core/Cabin/CabinLayoutSet.cs
+++ b/SLC_LayoutEditor/Core/Cabin/CabinLayoutSet.cs
@@ -97,7 +97,7 @@ private set
             }
         }
 
-        public string CurrentCountText => !mIsTemplatingMode ? (mLayoutCount != 1 ? string.Format("{0} layouts", mLayoutCount) : "1 template") :
+        public string CurrentCountText => !mIsTemplatingMode ? (mLayoutCount != 1 ? string.Format("{0} layouts", mLayoutCount) : "1 layout") :
                                                 mTemplateCount != 1 ? string.Format("{0} templates", mTemplateCount) : "1 template";
 
         public int TemplateCount
@@ -236,6 +236,7 @@ public void Delete()
             }
 
             layoutSetFolder.Delete(true);
+            Directory.Delete(Path.Combine(App.ThumbnailsPath, AircraftName), true);
             OnDeleted(EventArgs.Empty);
         }
 
diff --git a/SLC_LayoutEditor/Core/Cabin/CabinSlot.cs b/SLC_LayoutEditor/Core/Cabin/CabinSlot.cs
index 1c7ef41..5daa659 100644
--- a/SLC_LayoutEditor/Core/Cabin/CabinSlot.cs
+++ b/SLC_LayoutEditor/Core/Cabin/CabinSlot.cs
@@ -15,6 +15,7 @@ namespace SLC_LayoutEditor.Core.Cabin
 {
     public class CabinSlot : ViewModelBase
     {
+        public event EventHandler<CabinSlotChangedEventArgs> Rerendered;
         public event EventHandler<CabinSlotChangedEventArgs> Changed;
         public event EventHandler<CabinSlotChangedEventArgs> TypeChanged;
         public event EventHandler<CabinSlotChangedEventArgs> ProblematicChanged;
@@ -41,6 +42,8 @@ public class CabinSlot : ViewModelBase
 
         public string Guid => guid;
 
+        public bool IsChangedEventHooked { get; set; }
+
         public bool IsDirty
         {
             get => !isRemoved ? isDirty : true;
@@ -486,6 +489,7 @@ protected virtual void OnProblematicChanged(CabinSlotChangedEventArgs e)
             if (IsEvaluationActive)
             {
                 ProblematicChanged?.Invoke(this, e);
+                OnRerendered(e);
             }
         }
 
@@ -494,5 +498,10 @@ protected virtual void OnTypeChanged(CabinSlotChangedEventArgs e)
             IsDirty = true;
             TypeChanged?.Invoke(this, e);
         }
+
+        protected virtual void OnRerendered(CabinSlotChangedEventArgs e)
+        {
+            Rerendered?.Invoke(this, e);
+        }
     }
 }
diff --git a/SLC_LayoutEditor/Core/Cabin/LayoutTileRefreshData.cs b/SLC_LayoutEditor/Core/Cabin/LayoutTileRefreshData.cs
new file mode 100644
index 0000000..72a4687
--- /dev/null
+++ b/SLC_LayoutEditor/Core/Cabin/LayoutTileRefreshData.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SLC_LayoutEditor.Core.Cabin
+{
+    internal class LayoutTileRefreshData
+    {
+        private readonly bool isLoadingOnly;
+        private readonly CabinLayout cabinLayout;
+
+        public bool IsLoadingOnly => isLoadingOnly;
+
+        public CabinLayout CabinLayout => cabinLayout;
+
+        public LayoutTileRefreshData(CabinLayout cabinLayout, bool isLoadingOnly)
+        {
+            this.isLoadingOnly = isLoadingOnly;
+            this.cabinLayout = cabinLayout;
+        }
+    }
+}
diff --git a/SLC_LayoutEditor/Core/Cabin/TemplatePreview.cs b/SLC_LayoutEditor/Core/Cabin/TemplatePreview.cs
index bcb06dd..949a35b 100644
--- a/SLC_LayoutEditor/Core/Cabin/TemplatePreview.cs
+++ b/SLC_LayoutEditor/Core/Cabin/TemplatePreview.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Media;
+using Tasty.Logging;
 using Tasty.ViewModel;
 
 namespace SLC_LayoutEditor.Core.Cabin
@@ -57,8 +58,10 @@ public void GenerateThumbnails(bool overwrite = false)
                 return;
             }
 
+            Logger.Default.WriteLog("Generating thumbnails...");
             if (!template.IsLoaded)
             {
+                Logger.Default.WriteLog("Loading {0} code...", template.IsTemplate ? "template" : "layout");
                 template.LoadLayoutData();
             }
 
@@ -68,6 +71,7 @@ public void GenerateThumbnails(bool overwrite = false)
                 renderer.GenerateThumbnail(overwrite);
             }
 
+            Logger.Default.WriteLog("Thumbnails generated");
             LoadThumbnails();
             InvokePropertyChanged(nameof(HasThumbnails));
             InvokePropertyChanged(nameof(Thumbnails));
@@ -81,6 +85,7 @@ public ImageSource GetThumbnailForDeck(int index)
 
         private void LoadThumbnails()
         {
+            Logger.Default.WriteLog("Loading thumbnails from disk...");
             thumbnailPaths.Clear();
             deckNames.Clear();
             thumbnails.Clear();
@@ -96,6 +101,7 @@ private void LoadThumbnails()
                     }
                 }
             }
+            Logger.Default.WriteLog("{0} thumbnails have been loaded for {1} decks", thumbnails.Count, template.CabinDecks.Count);
         }
 
         public override string ToString()
diff --git a/SLC_LayoutEditor/Core/Enum/GuidedTourStep.cs b/SLC_LayoutEditor/Core/Enum/GuidedTourStep.cs
index 5268b0a..d168b13 100644
--- a/SLC_LayoutEditor/Core/Enum/GuidedTourStep.cs
+++ b/SLC_LayoutEditor/Core/Enum/GuidedTourStep.cs
@@ -13,6 +13,11 @@ internal enum GuidedTourStep
         LayoutSelectionCard,
         EditorModeToggle,
         AircraftSelectionArea,
+        LayoutsOverview,
+        AircraftActionsArea,
+        CreateLayoutFromOverview,
+        CreateTemplate,
+        DeleteAircraft,
         CreateLayout,
         BasicLayoutActionsArea,
         MakeTemplate,
diff --git a/SLC_LayoutEditor/Core/ExtensionMethods.cs b/SLC_LayoutEditor/Core/ExtensionMethods.cs
index 297fc6b..4bf5995 100644
--- a/SLC_LayoutEditor/Core/ExtensionMethods.cs
+++ b/SLC_LayoutEditor/Core/ExtensionMethods.cs
@@ -4,6 +4,7 @@
 using SLC_LayoutEditor.Core.Patcher;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -271,5 +272,11 @@ public static bool IsSameDialogType(this IDialog source, IDialog compareTo)
         {
             return source?.GetType() == compareTo?.GetType();
         }
+
+        public static object GetElapsedSecondsForLog(this Stopwatch sw)
+        {
+            return sw.ElapsedMilliseconds > 0 ?
+                Math.Round((decimal)sw.ElapsedMilliseconds / 1000, 3) : "< 1";
+        }
     }
 }
diff --git a/SLC_LayoutEditor/Core/Guide/GuidedTour.cs b/SLC_LayoutEditor/Core/Guide/GuidedTour.cs
index 8debcdb..9b7a999 100644
--- a/SLC_LayoutEditor/Core/Guide/GuidedTour.cs
+++ b/SLC_LayoutEditor/Core/Guide/GuidedTour.cs
@@ -31,6 +31,11 @@ internal class GuidedTour
         private UIElement createLayoutButton;
 
         private CabinLayoutControl editorArea;
+        private UIElement aircraftTitleCard;
+        private UIElement createTemplateButton;
+        private UIElement createLayoutFromOverviewButton;
+        private UIElement deleteAircraftButton;
+
         private UIElement layoutTitleCard;
         private UIElement makeTemplateButton;
         private UIElement reloadLayoutButton;
@@ -119,6 +124,12 @@ public GuidedTour(LayoutEditor editorContainer)
             this.createLayoutButton = editorContainer.btn_createLayout;
             this.layoutsArea = editorContainer.area_layouts;
 
+            AircraftLayoutsViewControl layoutsOverview = editorContainer.layouts_overview;
+            this.aircraftTitleCard = layoutsOverview.card_aircraftTitle;
+            this.createLayoutFromOverviewButton = layoutsOverview.btn_createLayout;
+            this.createTemplateButton = layoutsOverview.btn_createTemplate;
+            this.deleteAircraftButton = layoutsOverview.btn_deleteAircraft;
+
             this.layoutTitleCard = editorArea.card_layoutTitle;
             this.makeTemplateButton = editorArea.btn_makeTemplate;
             this.reloadLayoutButton = editorArea.btn_reloadLayout;
@@ -247,6 +258,31 @@ public void ContinueTour(bool resetAwaitInputFlag = false)
                         guidedElement = aircraftsArea;
                         AwaitUserInput = true;
                         break;
+                    case GuidedTourStep.LayoutsOverview:
+                        overrides.Title = "Aircraft layouts overview";
+                        overrides.Description = "By selecting an aircraft, you get an overview of all layouts for this aircraft.\n" +
+                            "If you toggle to templating mode, the view will adjust accordingly and show all templates.";
+                        overrides.ApplyOverlayToAll = true;
+                        overrides.TextPosition = GuideTextPosition.Over;
+                        guidedElement = rootContainer;
+                        break;
+                    case GuidedTourStep.AircraftActionsArea:
+                        overrides.Title = "Aircraft information & general actions";
+                        overrides.Description = "This area shows the name of your selected aircraft, and includes buttons to perform basic actions.\n" +
+                            "These will be described in more detail in the next few steps.";
+                        overrides.IsCircularCutout = false;
+                        overrides.TextPosition = GuideTextPosition.Bottom;
+                        guidedElement = aircraftTitleCard;
+                        break;
+                    case GuidedTourStep.CreateLayoutFromOverview:
+                        guidedElement = createLayoutFromOverviewButton;
+                        break;
+                    case GuidedTourStep.CreateTemplate:
+                        guidedElement = createTemplateButton;
+                        break;
+                    case GuidedTourStep.DeleteAircraft:
+                        guidedElement = deleteAircraftButton;
+                        break;
                     case GuidedTourStep.CreateLayout:
                         overrides.Description = "Now that you've selected an aircraft, it's time to create your new layout!\n\n" +
                             "To do this click on the highlighted button, which will bring up the layout creation dialog.\n" +
@@ -261,6 +297,7 @@ public void ContinueTour(bool resetAwaitInputFlag = false)
                         overrides.Description = "This card shows the name of your layout/template, and also contains buttons to perform actions on your layout.\n" +
                             "These will be described in more detail in the next few steps.";
                         overrides.IsCircularCutout = false;
+                        overrides.HighlightXOffset = 2;
                         overrides.TextPosition = GuideTextPosition.Bottom;
                         guidedElement = layoutTitleCard;
                         break;
@@ -559,8 +596,14 @@ private string GetTourStepCategory(GuidedTourStep tourStep)
                 case GuidedTourStep.LayoutSelectionCard:
                 case GuidedTourStep.EditorModeToggle:
                 case GuidedTourStep.AircraftSelectionArea:
-                case GuidedTourStep.CreateLayout:
                     return "Selection area";
+                case GuidedTourStep.LayoutsOverview:
+                case GuidedTourStep.AircraftActionsArea:
+                case GuidedTourStep.CreateLayoutFromOverview:
+                case GuidedTourStep.CreateTemplate:
+                case GuidedTourStep.DeleteAircraft:
+                    return "Layouts overview";
+                case GuidedTourStep.CreateLayout:
                 case GuidedTourStep.BasicLayoutActionsArea:
                 case GuidedTourStep.MakeTemplate:
                 case GuidedTourStep.ReloadLayout:
@@ -579,15 +622,17 @@ private string GetTourStepCategory(GuidedTourStep tourStep)
                 case GuidedTourStep.RowAndColumnSelect:
                 case GuidedTourStep.PlacingEssentials:
                 case GuidedTourStep.CompletingTheInterior:
+                    return "Creating a basic layout";
                 case GuidedTourStep.SlotConfiguratorToggle:
                 case GuidedTourStep.SelectingSeatAutomation:
                 case GuidedTourStep.SeatAutomationSettings:
                 case GuidedTourStep.ServicePoints:
                 case GuidedTourStep.ServicePointAutomationSettings:
                 case GuidedTourStep.AutoFixingIssues:
+                    return "Configuring slots & auto-fixing";
                 case GuidedTourStep.SaveLayout:
                 case GuidedTourStep.SaveLayoutAs:
-                    return "Creating a layout";
+                    return "Finishing up";
                 default:
                     return null;
             }
diff --git a/SLC_LayoutEditor/Core/PathFinding/CabinPathGrid.cs b/SLC_LayoutEditor/Core/PathFinding/CabinPathGrid.cs
index 2daf028..9d98e09 100644
--- a/SLC_LayoutEditor/Core/PathFinding/CabinPathGrid.cs
+++ b/SLC_LayoutEditor/Core/PathFinding/CabinPathGrid.cs
@@ -47,7 +47,7 @@ public void UpdateMap()
                 grid[slot.Row, slot.Column] = new Node(slot);
             }
             sw.Stop();
-            Logger.Default.WriteLog("Path map update complete, took {0} seconds", Math.Round((decimal)sw.ElapsedMilliseconds, 3));
+            Logger.Default.WriteLog("Path map update complete, took {0} seconds", sw.GetElapsedSecondsForLog());
 
             //PrintPathMap();
         }
diff --git a/SLC_LayoutEditor/Core/Util.cs b/SLC_LayoutEditor/Core/Util.cs
index 600ab9c..e51d1e9 100644
--- a/SLC_LayoutEditor/Core/Util.cs
+++ b/SLC_LayoutEditor/Core/Util.cs
@@ -175,6 +175,30 @@ public static bool SafeDeleteFile(string filePath)
             }
         }
 
+        public static void MoveThumbnailToDelete(CabinDeck cabinDeck)
+        {
+            string thumbnailPath = Path.Combine(cabinDeck.ThumbnailDirectory, cabinDeck.ThumbnailFileName);
+            MoveFileToDelete(new FileInfo(thumbnailPath));
+        }
+
+        public static void MoveFileToDelete(FileInfo fi)
+        {
+            string sourcePath = fi.FullName;
+            string destPath = Path.Combine(App.TempPath, "deleted", string.Format(".{0}", fi.Name));
+
+            MoveFileToDelete(sourcePath, destPath);
+        }
+
+        public static void MoveFileToDelete(string sourcePath, string destPath)
+        {
+            string deleteDirectoryPath = new FileInfo(destPath).Directory.FullName;
+            Directory.CreateDirectory(deleteDirectoryPath);
+
+            File.Move(sourcePath, destPath);
+            SafeDeleteFile(destPath);
+            Directory.Delete(deleteDirectoryPath, true);
+        }
+
         public static string ReadTextResource(string name)
         {
             // Determine path
@@ -195,7 +219,12 @@ private static bool CompareLayoutHashes(string originalFilePath, string current)
             {
                 return false;
             }
-            return !GetSHA256Hash(File.ReadAllText(originalFilePath).ToUpper()).Equals(GetSHA256Hash(current));
+            string savedLayoutCode = File.ReadAllText(originalFilePath).ToUpper();
+            if (savedLayoutCode.Trim() == "@")
+            {
+                savedLayoutCode = "";
+            }
+            return !GetSHA256Hash(savedLayoutCode).Equals(GetSHA256Hash(current));
         }
 
         public static string GetSHA256Hash(string value)
diff --git a/SLC_LayoutEditor/KeybindsCheatSheet.xaml b/SLC_LayoutEditor/KeybindsCheatSheet.xaml
index cd2c919..3259b1e 100644
--- a/SLC_LayoutEditor/KeybindsCheatSheet.xaml
+++ b/SLC_LayoutEditor/KeybindsCheatSheet.xaml
@@ -101,13 +101,13 @@
                         <controls:KeybindInfo Title="Set selected slots to &quot;Aisle&quot;" Keybind="Alt + A"
                                               Notes="Allows passengers and cabin crew to pass through"/>
                         <controls:KeybindInfo Title="Set selected slots to &quot;Wall&quot;" Keybind="Alt + W"/>
-                        <controls:KeybindInfo Title="Set selected slots to &quot;Door&quot;" Keybind="Ctrl + Alt + D"
+                        <controls:KeybindInfo Title="Set selected slots to &quot;Door&quot;" Keybind="Alt + D"
                                               Notes="Passenger enter and exit the plane through these"/>
-                        <controls:KeybindInfo Title="Set selected slots to &quot;Loading bay&quot;" Keybind="Ctrl + Alt + L"
+                        <controls:KeybindInfo Title="Set selected slots to &quot;Loading bay&quot;" Keybind="Alt + L"
                                               Notes="Used for loading and unloading cargo and luggage"/>
-                        <controls:KeybindInfo Title="Set selected slots to &quot;Catering door&quot;" Keybind="Ctrl + Alt + C"
+                        <controls:KeybindInfo Title="Set selected slots to &quot;Catering door&quot;" Keybind="Alt + C"
                                               Notes="Catering services use this for supplying the plane"/>
-                        <controls:KeybindInfo Title="Set selected slots to &quot;Cockpit&quot;" Keybind="Alt + C"
+                        <controls:KeybindInfo Title="Set selected slots to &quot;Cockpit&quot;" Keybind="Alt + P"
                                               Notes="Used by the captain and co-pilot to access the cockpit"/>
                     </UniformGrid>
                     <Separator/>
diff --git a/SLC_LayoutEditor/MainWindow.xaml b/SLC_LayoutEditor/MainWindow.xaml
index 66cddda..8a6a8f5 100644
--- a/SLC_LayoutEditor/MainWindow.xaml
+++ b/SLC_LayoutEditor/MainWindow.xaml
@@ -125,8 +125,9 @@
                                     <MenuItem Header="Buy me a coffee :)" Click="BuyACoffee_Clicked"/>
                                 </MenuItem>
                                 <MenuItem Header="Help">
-                                    <MenuItem Header="Welcome screen" Click="OpenWelcomeScreen_Click"/>
-                                    <MenuItem Click="ToggleGuide_Click">
+                                    <MenuItem Header="Welcome screen" Click="OpenWelcomeScreen_Click"
+                                              IsEnabled="{Binding IsGuideOpen, Converter={StaticResource InverseBooleanConverter}}"/>
+                                    <MenuItem Click="ToggleGuide_Click" IsEnabled="{Binding IsViewNotEditor, Converter={StaticResource InverseBooleanConverter}}">
                                         <MenuItem.Style>
                                             <Style TargetType="MenuItem" BasedOn="{StaticResource {x:Type MenuItem}}">
                                                 <Setter Property="Header" Value="Start tour"/>
@@ -142,6 +143,14 @@
                                               InputGestureText="Ctrl+K"
                                               IsEnabled="{Binding IsGuideOpen, Converter={StaticResource InverseBooleanConverter}}"/>
                                 </MenuItem>
+                                <MenuItem Header="DEBUG" Visibility="{Binding IsDebugMode, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                          IsEnabled="{Binding IsGuideOpen, Converter={StaticResource InverseBooleanConverter}}">
+                                    <MenuItem Header="Open current TEMP aircraft folder" Click="DebugMenuItem_Click" Tag="aircraft"/>
+                                    <MenuItem Header="Open current layout thumbnail folder" Click="DebugMenuItem_Click" Tag="layout"/>
+                                    <Separator Style="{StaticResource MenuSeparatorStyle}"/>
+                                    <MenuItem Header="Show kofi message" Click="DebugMenuItem_Click" Tag="kofi"/>
+                                    <MenuItem Header="Clear log" Click="DebugMenuItem_Click" Tag="clearlog"/>
+                                </MenuItem>
                             </Menu>
                             <Border Width="1.5" Background="{StaticResource SeparatorColorBrush}" Margin="8,6,12,6" CornerRadius="1"/>
 
@@ -214,8 +223,9 @@
                                     </Run>
                                 </TextBlock>
                             </Border>
-                            <Button VerticalAlignment="Center" Click="BackTo_Click" 
-                                    ToolTip="Return back to the layout overview for this aircraft">
+                            <Button VerticalAlignment="Center" Click="BackTo_Click"  Margin="0,0,32,0"
+                                    ToolTip="Return back to the layout overview for this aircraft"
+                                    IsEnabled="{Binding IsTitleBarEnabled}">
                                 <Button.Style>
                                     <Style TargetType="Button" BasedOn="{StaticResource GreenBorderlessButtonStyle}">
                                         <Setter Property="Visibility" Value="Collapsed"/>
@@ -329,10 +339,10 @@
         <!-- Slot type commands -->
         <KeyBinding Key="A" Modifiers="Alt" Command="{Binding SlotTypeAisleCommand}" CommandParameter="{Binding EditorViewModel}"/>
         <KeyBinding Key="W" Modifiers="Alt" Command="{Binding SlotTypeWallCommand}" CommandParameter="{Binding EditorViewModel}"/>
-        <KeyBinding Key="D" Modifiers="Ctrl+Alt" Command="{Binding SlotTypeDoorCommand}" CommandParameter="{Binding EditorViewModel}"/>
-        <KeyBinding Key="L" Modifiers="Ctrl+Alt" Command="{Binding SlotTypeLoadingBayCommand}" CommandParameter="{Binding EditorViewModel}"/>
-        <KeyBinding Key="C" Modifiers="Ctrl+Alt" Command="{Binding SlotTypeCateringDoorCommand}" CommandParameter="{Binding EditorViewModel}"/>
-        <KeyBinding Key="C" Modifiers="Alt" Command="{Binding SlotTypeCockpitCommand}" CommandParameter="{Binding EditorViewModel}"/>
+        <KeyBinding Key="D" Modifiers="Alt" Command="{Binding SlotTypeDoorCommand}" CommandParameter="{Binding EditorViewModel}"/>
+        <KeyBinding Key="L" Modifiers="Alt" Command="{Binding SlotTypeLoadingBayCommand}" CommandParameter="{Binding EditorViewModel}"/>
+        <KeyBinding Key="C" Modifiers="Alt" Command="{Binding SlotTypeCateringDoorCommand}" CommandParameter="{Binding EditorViewModel}"/>
+        <KeyBinding Key="P" Modifiers="Alt" Command="{Binding SlotTypeCockpitCommand}" CommandParameter="{Binding EditorViewModel}"/>
         <KeyBinding Key="G" Modifiers="Alt" Command="{Binding SlotTypeGalleyCommand}" CommandParameter="{Binding EditorViewModel}"/>
         <KeyBinding Key="T" Modifiers="Alt" Command="{Binding SlotTypeToiletCommand}" CommandParameter="{Binding EditorViewModel}"/>
         <KeyBinding Key="K" Modifiers="Alt" Command="{Binding SlotTypeKitchenCommand}" CommandParameter="{Binding EditorViewModel}"/>
diff --git a/SLC_LayoutEditor/MainWindow.xaml.cs b/SLC_LayoutEditor/MainWindow.xaml.cs
index dcd425e..3c6bd12 100644
--- a/SLC_LayoutEditor/MainWindow.xaml.cs
+++ b/SLC_LayoutEditor/MainWindow.xaml.cs
@@ -25,7 +25,6 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
-using System.Windows.Shapes;
 using Tasty.Logging;
 using Tasty.ViewModel.Communication;
 
@@ -486,16 +485,21 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             if (!App.Settings.DonateMessageShown &&
                 App.Settings.UsageTime.TotalHours >= FixedValues.HOURS_BEFORE_SUPPORT_NOTIFICATION)
             {
-                supportNotification = Notification.MakeNotification("Enjoying the editor?", 
-                    "I hope you're enjoying working within the editor so far!\n\n" +
-                    "And i you're feeling extra generous today:", FixedValues.ICON_HEART,
-                    (Style)App.Current.FindResource("SupportButtonStyle"), 
-                    4000, FixedValues.HEART_BRUSH);
-                supportNotification.ButtonClicked += BuyACoffee_Clicked;
-                supportNotification.Closed += SupportNotification_Closed;
+                ShowSupportNotification();
             }
         }
 
+        private void ShowSupportNotification(int showDelay = 4000)
+        {
+            supportNotification = Notification.MakeNotification("Enjoying the editor?",
+                "I hope you're enjoying working within the editor so far!\n\n" +
+                "And i you're feeling extra generous today:", FixedValues.ICON_HEART,
+                (Style)App.Current.FindResource("SupportButtonStyle"),
+                showDelay, FixedValues.HEART_BRUSH);
+            supportNotification.ButtonClicked += BuyACoffee_Clicked;
+            supportNotification.Closed += SupportNotification_Closed;
+        }
+
         private void BuyACoffee_Clicked(object sender, EventArgs e)
         {
             Process.Start("https://ko-fi.com/midnight_bagel");
@@ -526,5 +530,49 @@ private void BackTo_Click(object sender, RoutedEventArgs e)
                 Mediator.Instance.NotifyColleagues(ViewModelMessage.BackToLayoutOverview);
             }
         }
+
+        private void DebugMenuItem_Click(object sender, RoutedEventArgs e)
+        {
+            if (vm.EditorViewModel != null && sender is MenuItem menuItem)
+            {
+                switch (menuItem.Tag.ToString())
+                {
+                    case "aircraft":
+                        if (vm.EditorViewModel.SelectedLayoutSet == null)
+                        {
+                            return;
+                        }
+
+                        string aircraftTempPath = Path.Combine(App.ThumbnailsPath, vm.EditorViewModel.SelectedLayoutSet.AircraftName);
+                        if (!Directory.Exists(aircraftTempPath))
+                        {
+                            return;
+                        }
+
+                        Process.Start(aircraftTempPath);
+                        break;
+                    case "layout":
+                        if (vm.EditorViewModel.ActiveLayout == null)
+                        {
+                            return;
+                        }
+
+                        string layoutTempPath = Path.Combine(vm.EditorViewModel.ActiveLayout.ThumbnailDirectory);
+                        if (!Directory.Exists(layoutTempPath))
+                        {
+                            return;
+                        }
+
+                        Process.Start(layoutTempPath);
+                        break;
+                    case "clearlog":
+                        Logger.Default.ClearLog();
+                        break;
+                    case "kofi":
+                        ShowSupportNotification(0);
+                        break;
+                }
+            }
+        }
     }
 }
diff --git a/SLC_LayoutEditor/Resources/patchnotes.txt b/SLC_LayoutEditor/Resources/patchnotes.txt
index 0fc2911..ad22ee3 100644
--- a/SLC_LayoutEditor/Resources/patchnotes.txt
+++ b/SLC_LayoutEditor/Resources/patchnotes.txt
@@ -1,18 +1,27 @@
-07.06.2024 m
-Added: After all this time there finally is an About section now! Can be accessed via "Editor" -> "About", or by pressing F1
+10.06.2024 m
+Added: Selecting an aircraft now shows an overview of all layouts within
 Added: You can now specify the size of a deck when adding one
 Added: You can now auto-fix invalid door placements
 Added: New keybinds to create aircrafts (Ctrl + Shift + N), layouts (Ctrl + N) and templates (Ctrl + Alt + N)
 Added: There is now a "Return to layout/template overview" button in the title bar whenever a layout or template is currently open
+Added: After all this time there finally is an About section now! Can be accessed via "Editor" -> "About", or by pressing F1
 Added: A new seasonal theme has been added. Happy pride month!
+Updated: Added additional guide steps to explain the new layouts overview
 Updated: Replaced the icon for the editor
 Updated: Slighty reworked the way patchnote entries are formatted
+Changed: To better fit in with the other hotkeys, the keybinds for changing slots to doors (new: Alt + D), loading bays (new: Alt + L) and catering doors (new: Alt + C) have changed
+Changed: The keybind for changing slots to cockpit type has been changed to Alt + P
+Changed: In order to prevent issues with Windows, certain characters are now disallowed when creating or renaming any aircraft, layout or template. The disallowed characters are: / : * ? \" < > |
 Changed: Moved the "What's new?" menu item from "Help" to "Editor"
 Changed: Moved the "Welcome screen" menu item from "Editor" to "Help"
+Changed: Increased opacity for error highlighting
 Changed: Moved the "Back to editor" button to the left and updated the appearance, in order to fit in with the "Return to layout overview" button style
 Changed: Dialogs now have a close button in the top right corner
 Changed: Both the changelog dialog as well as the dialog to manage baked template got their close buttons replaced with the new close button
+Changed: Log files are now limited to 2k lines
+Fixed: Certain layout validators are now able to be not required (e.g. layouts with only one deck do not require stairways), thus not showing up as an issue
 Fixed: When a layout or template had no decks when loaded, the editor detected unsaved changes on said layout/template
 Fixed: The selection highlight glitched out when applying any autofix, and a selected slot was affected
-Fixed: Smaller UI fixes
+Fixed: The aircraft dropdown showed "1 template" instead of "1 layout" when not in templating mode
+Fixed: Various smaller UI fixes
 Removed: Removed unused resources
\ No newline at end of file
diff --git a/SLC_LayoutEditor/SLC_LayoutEditor.csproj b/SLC_LayoutEditor/SLC_LayoutEditor.csproj
index 536ce2a..fff8551 100644
--- a/SLC_LayoutEditor/SLC_LayoutEditor.csproj
+++ b/SLC_LayoutEditor/SLC_LayoutEditor.csproj
@@ -62,10 +62,12 @@
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
-    <Reference Include="Tasty.Logging">
-      <HintPath>..\..\Tasty.Toolkit\Tasty.Logging\bin\Release\Tasty.Logging.dll</HintPath>
+    <Reference Include="Tasty.Logging, Version=1.0.2.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\Tasty.Toolkit\Tasty.SQLiteManager\bin\Release\Tasty.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Tasty.ViewModel">
+    <Reference Include="Tasty.ViewModel, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\Tasty.Toolkit\Tasty.ViewModel\bin\Release\Tasty.ViewModel.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
@@ -210,6 +212,7 @@
     <Compile Include="Core\Guide\GuidedTour.cs" />
     <Compile Include="Core\Guide\LiveGuideData.cs" />
     <Compile Include="Core\IThemeManager.cs" />
+    <Compile Include="Core\Cabin\LayoutTileRefreshData.cs" />
     <Compile Include="Core\Memento\CabinChange.cs" />
     <Compile Include="Core\Memento\CabinHistory.cs" />
     <Compile Include="Core\Memento\CabinHistoryEntry.cs" />
diff --git a/SLC_LayoutEditor/Themes/Colors.xaml b/SLC_LayoutEditor/Themes/Colors.xaml
index 489d043..b9ed3a2 100644
--- a/SLC_LayoutEditor/Themes/Colors.xaml
+++ b/SLC_LayoutEditor/Themes/Colors.xaml
@@ -147,14 +147,14 @@
     <SolidColorBrush x:Key="ValidForegroundColorBrush" Color="{StaticResource ButtonBorderColor}"/>
 
     <LinearGradientBrush x:Key="ErrorHighlightColorBrush" EndPoint="11,0" StartPoint="0,11" 
-                         MappingMode="Absolute" SpreadMethod="Repeat" Opacity=".55">
+                         MappingMode="Absolute" SpreadMethod="Repeat" Opacity=".9">
         <GradientStop Color="Transparent" Offset="0"/>
         <GradientStop Color="Transparent" Offset=".5"/>
         <GradientStop Color="{StaticResource ErrorDarkColor}" Offset=".5"/>
         <GradientStop Color="{StaticResource ErrorDarkColor}" Offset="1"/>
     </LinearGradientBrush>
     <LinearGradientBrush x:Key="ErrorSelectedHighlightColorBrush" EndPoint="11,0" StartPoint="0,11" 
-                         MappingMode="Absolute" SpreadMethod="Repeat" Opacity=".55">
+                         MappingMode="Absolute" SpreadMethod="Repeat" Opacity=".9">
         <GradientStop Color="#45FFFFFF" Offset="0"/>
         <GradientStop Color="#45FFFFFF" Offset=".5"/>
         <GradientStop Color="{StaticResource ErrorColor}" Offset=".5"/>
diff --git a/SLC_LayoutEditor/Themes/Styles/ComboBoxStyle.xaml b/SLC_LayoutEditor/Themes/Styles/ComboBoxStyle.xaml
index 9131ec8..05b16d3 100644
--- a/SLC_LayoutEditor/Themes/Styles/ComboBoxStyle.xaml
+++ b/SLC_LayoutEditor/Themes/Styles/ComboBoxStyle.xaml
@@ -134,7 +134,7 @@
                                     <ControlTemplate.Triggers>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="false"/>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false"/>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true"/>
@@ -149,14 +149,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder">
@@ -175,14 +175,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder">
@@ -202,14 +202,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DisabledColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DisabledColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder" Value="Transparent"/>
@@ -327,7 +327,7 @@
                                     <ControlTemplate.Triggers>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="false"/>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false"/>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true"/>
@@ -342,14 +342,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder">
@@ -368,14 +368,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder">
@@ -395,14 +395,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DisabledColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:RefinedComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DisabledColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder" Value="Transparent"/>
@@ -532,7 +532,7 @@
                                     <ControlTemplate.Triggers>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="true"/>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="false"/>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false"/>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true"/>
@@ -547,14 +547,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder">
@@ -573,14 +573,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder">
@@ -600,14 +600,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DisabledColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DisabledColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder" Value="Transparent"/>
@@ -712,7 +712,7 @@
                                     <ControlTemplate.Triggers>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="true"/>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="false"/>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="false"/>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="true"/>
@@ -727,14 +727,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder">
@@ -753,14 +753,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsPressed, RelativeSource={RelativeSource Self}}" Value="true"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource ForegroundHoverColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder">
@@ -780,14 +780,14 @@
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="false"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="false"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DisabledColorBrush}"/>
                                         </MultiDataTrigger>
                                         <MultiDataTrigger>
                                             <MultiDataTrigger.Conditions>
                                                 <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false"/>
-                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}" Value="true"/>
+                                                <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ComboBox}}}" Value="true"/>
                                             </MultiDataTrigger.Conditions>
                                             <Setter Property="BorderBrush" TargetName="templateRoot" Value="{DynamicResource DisabledColorBrush}"/>
                                             <Setter Property="Background" TargetName="splitBorder" Value="Transparent"/>
diff --git a/SLC_LayoutEditor/Themes/Styles/ListStyle.xaml b/SLC_LayoutEditor/Themes/Styles/ListStyle.xaml
index 1c8f07f..87d4ff3 100644
--- a/SLC_LayoutEditor/Themes/Styles/ListStyle.xaml
+++ b/SLC_LayoutEditor/Themes/Styles/ListStyle.xaml
@@ -9,6 +9,7 @@
     <Style TargetType="DataGrid">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="HeadersVisibility" Value="None"/>
+        <Setter Property="RowHeaderWidth" Value="0"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="GridLinesVisibility" Value="None"/>
         <Setter Property="CanUserAddRows" Value="False"/>
diff --git a/SLC_LayoutEditor/UI/Dialogs/ConfirmationDialog.xaml b/SLC_LayoutEditor/UI/Dialogs/ConfirmationDialog.xaml
index 520832e..2c5d332 100644
--- a/SLC_LayoutEditor/UI/Dialogs/ConfirmationDialog.xaml
+++ b/SLC_LayoutEditor/UI/Dialogs/ConfirmationDialog.xaml
@@ -6,7 +6,11 @@
            xmlns:local="clr-namespace:SLC_LayoutEditor.UI.Dialogs"
            mc:Ignorable="d" x:Name="dialog"
            MinHeight="170" Width="370">
-    <TextBlock DockPanel.Dock="Top" Text="{Binding ElementName=dialog, Path=Title}" Style="{DynamicResource Title1TextStyle}" Margin="4"/>
+    <DockPanel DockPanel.Dock="Top" Margin="0,0,4,0">
+        <Button Style="{StaticResource CloseDialogButtonStyle}" Click="Cancel_Click"
+                DockPanel.Dock="Right" Margin="12,10,4,8"/>
+        <TextBlock Text="{Binding ElementName=dialog, Path=Title}" Style="{DynamicResource Title1TextStyle}"/>
+    </DockPanel>
     <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom"
                 HorizontalAlignment="Right">
         <Button Content="{Binding ElementName=dialog, Path=LeftButtonText, FallbackValue=Left}" MinWidth="80" Margin="8"
diff --git a/SLC_LayoutEditor/UI/Dialogs/ConfirmationDialog.xaml.cs b/SLC_LayoutEditor/UI/Dialogs/ConfirmationDialog.xaml.cs
index 9041350..abfc48f 100644
--- a/SLC_LayoutEditor/UI/Dialogs/ConfirmationDialog.xaml.cs
+++ b/SLC_LayoutEditor/UI/Dialogs/ConfirmationDialog.xaml.cs
@@ -303,5 +303,10 @@ private void RightButton_Click(object sender, RoutedEventArgs e)
         {
             OnDialogClosing(new DialogClosingEventArgs(RightResult));
         }
+
+        private void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            CancelDialog();
+        }
     }
 }
diff --git a/SLC_LayoutEditor/UI/Dialogs/CreateAircraftDialog.xaml b/SLC_LayoutEditor/UI/Dialogs/CreateAircraftDialog.xaml
index 2eb2f0f..d6589ad 100644
--- a/SLC_LayoutEditor/UI/Dialogs/CreateAircraftDialog.xaml
+++ b/SLC_LayoutEditor/UI/Dialogs/CreateAircraftDialog.xaml
@@ -19,7 +19,8 @@
     <TextBlock DockPanel.Dock="Top" Margin="8,8,8,4" Text="Aircraft name"/>
     <TextBox x:Name="input" DockPanel.Dock="Top" Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}" Margin="8,0"
              KeyUp="input_KeyUp"/>
-    <TextBlock DockPanel.Dock="Top" Style="{StaticResource DialogErrorTextStyle}" Text="{Binding ErrorMessage, UpdateSourceTrigger=PropertyChanged}"/>
+    <TextBlock DockPanel.Dock="Top" Style="{StaticResource DialogErrorTextStyle}" Text="{Binding ErrorMessage, UpdateSourceTrigger=PropertyChanged}"
+               Margin="8,2,8,0"/>
 
     <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom"
                 HorizontalAlignment="Right">
diff --git a/SLC_LayoutEditor/UI/Dialogs/SpecifyDeckSizeDialog.xaml b/SLC_LayoutEditor/UI/Dialogs/SpecifyDeckSizeDialog.xaml
index f296fe0..9babb0f 100644
--- a/SLC_LayoutEditor/UI/Dialogs/SpecifyDeckSizeDialog.xaml
+++ b/SLC_LayoutEditor/UI/Dialogs/SpecifyDeckSizeDialog.xaml
@@ -14,36 +14,7 @@
     <DockPanel DockPanel.Dock="Top" Margin="0,0,4,0">
         <Button Style="{StaticResource CloseDialogButtonStyle}" Click="Cancel_Click"
                 DockPanel.Dock="Right" Margin="12,10,4,8"/>
-        <TextBlock>
-            <TextBlock.Style>
-                <Style TargetType="TextBlock" BasedOn="{StaticResource Title1TextStyle}">
-                    <Setter Property="Text" Value="Specify deck size"/>
-                    <Style.Triggers>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding IsTemplate}" Value="True"/>
-                                <Condition Binding="{Binding IsSaveAs}" Value="False"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Text" Value="Create a new template"/>
-                        </MultiDataTrigger>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding IsTemplate}" Value="False"/>
-                                <Condition Binding="{Binding IsSaveAs}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Text" Value="Save cabin layout as"/>
-                        </MultiDataTrigger>
-                        <MultiDataTrigger>
-                            <MultiDataTrigger.Conditions>
-                                <Condition Binding="{Binding IsTemplate}" Value="True"/>
-                                <Condition Binding="{Binding IsSaveAs}" Value="True"/>
-                            </MultiDataTrigger.Conditions>
-                            <Setter Property="Text" Value="Save template as"/>
-                        </MultiDataTrigger>
-                    </Style.Triggers>
-                </Style>
-            </TextBlock.Style>
-        </TextBlock>
+        <TextBlock Text="Specify deck size" Style="{StaticResource Title1TextStyle}"/>
     </DockPanel>
     <UniformGrid Rows="1" Columns="2" DockPanel.Dock="Top">
         <StackPanel>
@@ -68,7 +39,7 @@
 
     <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom"
                 HorizontalAlignment="Right">
-        <Button Content="Create" Width="80" Margin="8" IsEnabled="{Binding IsValid, UpdateSourceTrigger=PropertyChanged}"
+        <Button Content="Create" Width="80" Margin="8"
                 Click="Create_Click"/>
 
         <Button Content="Cancel" Width="80" Margin="8" Click="Cancel_Click"
diff --git a/SLC_LayoutEditor/UI/Dialogs/SpecifyDeckSizeDialog.xaml.cs b/SLC_LayoutEditor/UI/Dialogs/SpecifyDeckSizeDialog.xaml.cs
index 7c3f154..ebf13d8 100644
--- a/SLC_LayoutEditor/UI/Dialogs/SpecifyDeckSizeDialog.xaml.cs
+++ b/SLC_LayoutEditor/UI/Dialogs/SpecifyDeckSizeDialog.xaml.cs
@@ -30,8 +30,8 @@ public SpecifyDeckSizeDialog(int initialRows, int initialColumns)
         {
             InitializeComponent();
             vm = DataContext as SpecifyDeckSizeDialogViewModel;
-            vm.Rows = initialRows;
-            vm.Columns = initialColumns;
+            vm.Rows = initialColumns;
+            vm.Columns = initialRows;
         }
 
         private void Create_Click(object sender, RoutedEventArgs e)
diff --git a/SLC_LayoutEditor/UI/LayoutEditor.xaml b/SLC_LayoutEditor/UI/LayoutEditor.xaml
index 5527049..b77d680 100644
--- a/SLC_LayoutEditor/UI/LayoutEditor.xaml
+++ b/SLC_LayoutEditor/UI/LayoutEditor.xaml
@@ -744,7 +744,7 @@
                 ContextMenu="{StaticResource GuideMenu}"/>
     </Grid>
 
-    <controls:AircraftLayoutsViewControl SelectedAirframe="{Binding SelectedLayoutSet}"
+    <controls:AircraftLayoutsViewControl x:Name="layouts_overview" SelectedAirframe="{Binding SelectedLayoutSet}"
                                          IsHeaderEnabled="{Binding SelectedLayoutSet, Converter={StaticResource NotNullToBooleanConverter}}"
                                          GuideMenu="{StaticResource GuideMenu}"
                                          IsTemplatingMode="{Binding IsTemplatingMode}">
diff --git a/SLC_LayoutEditor/UI/LayoutEditor.xaml.cs b/SLC_LayoutEditor/UI/LayoutEditor.xaml.cs
index 9d4f212..85c4fc7 100644
--- a/SLC_LayoutEditor/UI/LayoutEditor.xaml.cs
+++ b/SLC_LayoutEditor/UI/LayoutEditor.xaml.cs
@@ -56,6 +56,7 @@ public LayoutEditor()
             vm.Changed += CabinLayoutChanged;
             vm.SelectionRollback += Vm_SelectionRollback;
             vm.ActiveLayoutForceUpdated += Vm_ActiveLayoutForceUpdated;
+            vm.RegenerateThumbnails += Vm_RegenerateThumbnails;
 
             Mediator.Instance.Register(o =>
             {
@@ -97,6 +98,11 @@ public LayoutEditor()
             }, ViewModelMessage.Keybind_Begin_CreateAircraft);
         }
 
+        private void Vm_RegenerateThumbnails(object sender, EventArgs e)
+        {
+            control_layout.GenerateThumbnailsForLayout(true);
+        }
+
         public void DeselectAllSlots()
         {
             control_layout.DeselectSlots();
@@ -240,7 +246,7 @@ private void SaveLayout()
             bool isTemplate = vm.ActiveLayout.IsTemplate;
 
             vm.ActiveLayout.SaveLayout();
-            control_layout.GenerateThumbnailForLayout(true);
+            control_layout.GenerateThumbnailsForLayout(true);
 
             if (!isTemplate)
             {
@@ -871,7 +877,7 @@ private void Layouts_SelectionChanged(object sender, SelectionChangedEventArgs e
         private void SlotTypeChangedForTour()
         {
             if (App.GuidedTour != null && (App.GuidedTour.IsAwaitingSlotChangeToDoor ||
-                App.GuidedTour.IsAwaitingBorderSlotSelection))
+                App.GuidedTour.IsAwaitingBorderSlotSelection && vm.ActiveLayout != null))
             {
                 int doorCount = vm.ActiveLayout.CountSlots(CabinSlotType.Door);
                 int loadingBayCount = vm.ActiveLayout.CountSlots(CabinSlotType.LoadingBay);
diff --git a/SLC_LayoutEditor/ViewModel/AddEditDialogViewModel.cs b/SLC_LayoutEditor/ViewModel/AddEditDialogViewModel.cs
index 78cf2da..4a149a3 100644
--- a/SLC_LayoutEditor/ViewModel/AddEditDialogViewModel.cs
+++ b/SLC_LayoutEditor/ViewModel/AddEditDialogViewModel.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Tasty.ViewModel;
 
@@ -10,6 +11,7 @@ namespace SLC_LayoutEditor.ViewModel
     public class AddEditDialogViewModel : BaseDialogViewModel
     {
         private string nameExistsErrorMessage;
+        private Regex blacklistedCharacters = new Regex(@"(\\|\/|:|\*|\?|\""|<|>|\|)");
 
         private string mName;
         private List<string> mExistingNames = new List<string>();
@@ -46,6 +48,10 @@ public string ErrorMessage
                 {
                     return "Name cannot be empty!";
                 }
+                else if (blacklistedCharacters.IsMatch(mName))
+                {
+                    return "Name canot contain any of the following characters:\n\\ / : * ? \" < > |";
+                }
                 else if (mExistingNames.Contains(mName))
                 {
                     return nameExistsErrorMessage;
diff --git a/SLC_LayoutEditor/ViewModel/CabinLayoutTileViewModel.cs b/SLC_LayoutEditor/ViewModel/CabinLayoutTileViewModel.cs
index 4099bba..d887e42 100644
--- a/SLC_LayoutEditor/ViewModel/CabinLayoutTileViewModel.cs
+++ b/SLC_LayoutEditor/ViewModel/CabinLayoutTileViewModel.cs
@@ -8,6 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
+using Tasty.Logging;
 using Tasty.ViewModel;
 using Tasty.ViewModel.Communication;
 
@@ -19,7 +20,6 @@ internal class CabinLayoutTileViewModel : ViewModelBase
 
         private int mThumbnailIndex;
         private int mThumbnailCount;
-        private bool mHasLayoutDecks;
         private List<BitmapImage> thumbnails = new List<BitmapImage>();
         private string mTitle;
         private bool mIsSelected;
@@ -98,21 +98,23 @@ public CabinLayoutTileViewModel()
             {
                 if (o is CabinLayout cabinLayout)
                 {
-                    LoadThumbnails(cabinLayout.ThumbnailDirectory);
+                    LoadThumbnails();
                 }
             }, ViewModelMessage.Layout_Tile_Init);
         }
 
-        public void LoadThumbnails(string thumbnailsPath)
+        public void LoadThumbnails()
         {
             if (thumbnails.Count > 0)
             {
                 thumbnails.Clear();
             }
 
-            if (thumbnailsPath != null && Directory.Exists(thumbnailsPath))
+            string thumbnailsDirectoryPath = CabinLayout.ThumbnailDirectory;
+            if (thumbnailsDirectoryPath != null && Directory.Exists(thumbnailsDirectoryPath))
             {
-                foreach (FileInfo fi in new DirectoryInfo(thumbnailsPath).EnumerateFiles("*.png"))
+                CabinLayout.CheckThumbnailStore();
+                foreach (FileInfo fi in new DirectoryInfo(thumbnailsDirectoryPath).EnumerateFiles("*.png"))
                 {
                     thumbnails.Add(Util.LoadImage(fi.FullName));
                 }
@@ -122,22 +124,24 @@ public void LoadThumbnails(string thumbnailsPath)
             ThumbnailIndex = 0;
         }
 
-        public void GenerateThumbnails(CabinLayout cabinLayout)
+        public void GenerateThumbnails()
         {
-            if (mHasLayoutDecks)
+            Logger.Default.WriteLog("User requested generating thumbnail for {0} \"{1}\"", 
+                CabinLayout.IsTemplate ? "template" : "layout", CabinLayout.LayoutName);
+            if (HasLayoutDecks)
             {
-                TemplatePreview preview = new TemplatePreview(cabinLayout);
+                TemplatePreview preview = new TemplatePreview(CabinLayout);
 
                 preview?.GenerateThumbnails(true);
 
                 if (preview?.HasThumbnails ?? false)
                 {
-                    LoadThumbnails(cabinLayout.ThumbnailDirectory);
+                    LoadThumbnails();
                 }
             }
             else
             {
-                LoadThumbnails(null);
+                LoadThumbnails();
             }
         }
     }
diff --git a/SLC_LayoutEditor/ViewModel/LayoutEditorViewModel.cs b/SLC_LayoutEditor/ViewModel/LayoutEditorViewModel.cs
index 512a768..35c247f 100644
--- a/SLC_LayoutEditor/ViewModel/LayoutEditorViewModel.cs
+++ b/SLC_LayoutEditor/ViewModel/LayoutEditorViewModel.cs
@@ -43,13 +43,14 @@ class LayoutEditorViewModel : ViewModelBase
         private CabinLayout editNameTarget;
 
         private bool hasUnsavedChanges;
-        private dynamic storedNewValue = new Unset();
-        private Type storedNewValueType;
+        private dynamic storedNewLayout = new Unset();
+        private dynamic storedNewAircraft = new Unset();
 
         public event EventHandler<CabinLayoutSelectedEventArgs> CabinLayoutSelected;
         public event EventHandler<ChangedEventArgs> Changed;
         public event EventHandler<SelectionRollbackEventArgs> SelectionRollback;
         public event EventHandler<EventArgs> ActiveLayoutForceUpdated;
+        public event EventHandler<EventArgs> RegenerateThumbnails;
 
         private VeryObservableCollection<CabinLayoutSet> mLayoutSets = 
             new VeryObservableCollection<CabinLayoutSet>("LayoutSets");
@@ -127,8 +128,9 @@ public bool ShowDuplicateDoorsIssues
             }
         }
 
-        public string StairwayErrorMessage => ActiveLayout?.CabinDecks?.Count > 1 ? "Invalid stairway positions!" :
-                "Stairway can be removed!";
+        public bool HasMultipleDecks => ActiveLayout?.CabinDecks?.Count > 1;
+
+        public string StairwayErrorMessage => ActiveLayout?.StairwayErrorMessage;
         #endregion
 
         public VeryObservableCollection<CabinLayoutSet> LayoutSets
@@ -148,9 +150,23 @@ public CabinLayoutSet SelectedLayoutSet
             {
                 if (CheckUnsavedChanges(value))
                 {
+                    storedNewAircraft = value;
                     return;
                 }
 
+                if (mSelectedLayoutSet != value)
+                {
+                    if (value != null)
+                    {
+                        Logger.Default.WriteLog("Switching current aicraft... (Current: {0}; New: {1})", 
+                            mSelectedLayoutSet != null ? mSelectedLayoutSet.AircraftName : "<UNSET>", value.AircraftName);
+                    }
+                    else
+                    {
+                        Logger.Default.WriteLog("Unloading aircraft \"{0}\"...", mSelectedLayoutSet.AircraftName);
+                    }
+                }
+
                 mSelectedLayoutSet = value;
                 InvokePropertyChanged();
                 InvokePropertyChanged(nameof(IsAddCabinLayoutButtonEnabled));
@@ -181,6 +197,7 @@ public CabinLayout SelectedCabinLayout
                 {
                     return;
                 }
+                Mediator.Instance.NotifyColleagues(ViewModelMessage.Layout_Tile_RefreshData, new LayoutTileRefreshData(mSelectedCabinLayout, true));
                 mSelectedCabinLayout = value;
 
                 if (value != null && SelectedTemplate != null)
@@ -207,6 +224,7 @@ public CabinLayout SelectedTemplate
                 {
                     return;
                 }
+                Mediator.Instance.NotifyColleagues(ViewModelMessage.Layout_Tile_RefreshData, new LayoutTileRefreshData(mSelectedTemplate, true));
                 mSelectedTemplate = value;
 
                 if (value != null && SelectedCabinLayout != null)
@@ -450,7 +468,7 @@ public string AutomationSeatLetters
 
         public int RequiredLettersForAutomation
         {
-            get => ActiveLayout.CabinDecks.Sum(x => x.CountRowsWithSeats());
+            get => ActiveLayout?.CabinDecks.Sum(x => x.CountRowsWithSeats()) ?? 0;
             set
             {
                 mRequiredLettersForAutomation = value;
@@ -778,12 +796,12 @@ public bool CheckUnsavedChanges(dynamic newValue, bool isClosing = false)
             if (hasUnsavedChanges)
             {
                 bool isTemplate = ActiveLayout.IsTemplate;
-                storedNewValue = newValue;
+                storedNewLayout = newValue;
 
-                IDialog dialog = new ConfirmationDialog(
-                    newValue == null ? "Save before returning to overview?" : !isClosing ? "Save before swapping " + (!isTemplate ? "layout" : "template") : 
-                    "Save before closing?",
+                ConfirmationDialog dialog = new ConfirmationDialog(
+                    isClosing ? "Save before closing?" : (newValue == null ? "Save before returning to overview?" : "Save before swapping " + (!isTemplate ? "layout" : "template")),
                     "Do you want to save the current " + (!isTemplate ? "layout" : "template") + " before " + (!isClosing ? "proceeding" : "closing the editor") + "?", DialogType.YesNoCancel);
+                dialog.Width = 430;
 
                 dialog.DialogClosing += UnsavedChangesDialog_DialogClosing;
                 dialog.ShowDialog();
@@ -797,7 +815,15 @@ public void ClearSelection()
             SelectedCabinSlots.Clear();
             SelectedCabinSlotTypeId = -1;
             SelectedMultiSlotTypeIndex = -1;
+
+            SelectedAutomationIndex = -1;
+            AutomationSeatLetters = "";
+            AutomationSeatStartNumber = 1;
+            ServiceAreasCount = 1;
+            IsAutomationChecked = false;
             AutomationSelectedDeck = null;
+            AutomationCountEmptySlots = false;
+            MaxRowsPerServiceGroup = 8;
             InvokePropertyChanged(nameof(SelectedCabinSlot));
             InvokePropertyChanged(nameof(SelectedCabinSlots));
             InvokePropertyChanged(nameof(IsSingleCabinSlotSelected));
@@ -896,6 +922,7 @@ private void UnsavedChangesDialog_DialogClosing(object sender, DialogClosingEven
             if (e.DialogResult == DialogResultType.Yes)
             {
                 shownLayout.SaveLayout();
+                OnRegenerateThumbnails(EventArgs.Empty);
             }
             else if (e.DialogResult == DialogResultType.No)
             {
@@ -903,12 +930,14 @@ private void UnsavedChangesDialog_DialogClosing(object sender, DialogClosingEven
             }
             InvokePropertyChanged(nameof(HasUnsavedChanges));
 
-            if (!(storedNewValue is Unset))
+
+            if (e.DialogResult != DialogResultType.Cancel)
             {
-                if (e.DialogResult != DialogResultType.Cancel) // User doesn't cancel, apply newly selected data
+                #region Handle post-layout swap
+                if (!(storedNewLayout is Unset))
                 {
                     HasUnsavedChanges = false;
-                    if (storedNewValue is CabinLayout selectedLayout)
+                    if (storedNewLayout is CabinLayout selectedLayout)
                     {
                         if (!selectedLayout.IsTemplate)
                         {
@@ -930,31 +959,34 @@ private void UnsavedChangesDialog_DialogClosing(object sender, DialogClosingEven
                             SelectedTemplate = null;
                         }
                     }
-                    /*else if (storedNewValue is CabinLayoutSet selectedLayoutSet)
-                    {
-                        SelectedLayoutSet = selectedLayoutSet;
-                    }*/
                 }
-                else
+                #endregion
+
+                #region Handle post-aircraft swap
+                if (!(storedNewAircraft is Unset))
+                {
+                    SelectedLayoutSet = (storedNewAircraft is CabinLayoutSet aircraft) ? aircraft : null;
+                }
+                #endregion
+            }
+            else
+            {
+                if (!(storedNewLayout is Unset))
                 {
                     OnSelectionRollback(new SelectionRollbackEventArgs(ActiveLayout,
                         (!IsTemplatingMode ? SelectedLayoutSet.CabinLayouts : SelectedLayoutSet.Templates)
                             .IndexOf(shownLayout), RollbackType.CabinLayout));
-                    /*if (storedNewValue is CabinLayout)
-                    {
-                        OnSelectionRollback(new SelectionRollbackEventArgs(ActiveLayout,
-                            (!IsTemplatingMode ? SelectedLayoutSet.CabinLayouts : SelectedLayoutSet.Templates)
-                                .IndexOf(shownLayout), RollbackType.CabinLayout));
-                    }
-                    else if (storedNewValue is CabinLayoutSet)
-                    {
-                        OnSelectionRollback(new SelectionRollbackEventArgs(SelectedLayoutSet, AircraftListSortConverter.Sort(mLayoutSets)
-                            .ToList().IndexOf(SelectedLayoutSet), RollbackType.CabinLayoutSet));
-                    }*/
+                }
+
+                if (!(storedNewAircraft is Unset))
+                {
+                    OnSelectionRollback(new SelectionRollbackEventArgs(SelectedLayoutSet, AircraftListSortConverter.Sort(mLayoutSets)
+                        .ToList().IndexOf(SelectedLayoutSet), RollbackType.CabinLayoutSet));
                 }
             }
 
-            storedNewValue = new Unset();
+            storedNewLayout = new Unset();
+            storedNewAircraft = new Unset();
             bool isCancel = e.DialogResult == DialogResultType.Cancel;
             Mediator.Instance.NotifyColleagues(ViewModelMessage.UnsavedChangesDialogClosed, !isCancel);
         }
@@ -1061,5 +1093,10 @@ protected virtual void OnActiveLayoutForceUpdated(EventArgs e)
         {
             ActiveLayoutForceUpdated?.Invoke(this, e);
         }
+
+        protected virtual void OnRegenerateThumbnails(EventArgs e)
+        {
+            RegenerateThumbnails?.Invoke(this, e);
+        }
     }
 }
diff --git a/SLC_LayoutEditor/ViewModel/MainViewModel.cs b/SLC_LayoutEditor/ViewModel/MainViewModel.cs
index 0a8f332..ba9d02f 100644
--- a/SLC_LayoutEditor/ViewModel/MainViewModel.cs
+++ b/SLC_LayoutEditor/ViewModel/MainViewModel.cs
@@ -45,6 +45,8 @@ class MainViewModel : MementoViewModel
 
         private bool mIsSearching;
 
+        public bool IsDebugMode => App.IsDebugMode;
+
         #region Commands
         public CreateCabinLayoutCommand CreateCabinLayoutCommand => CommandInterface.CreateCabinLayoutCommand;
 
@@ -205,6 +207,7 @@ public IDialog Dialog
                 mDialog = value;
                 InvokePropertyChanged();
                 InvokePropertyChanged(nameof(IsDialogOpen));
+                InvokePropertyChanged(nameof(IsTitleBarEnabled));
 
                 if (mDialog != null)
                 {
@@ -271,7 +274,9 @@ public FrameworkElement Content
 
         public bool IsLayoutOpened => EditorViewModel?.ActiveLayout != null;
 
-        public bool AllowHistoryCommands => !IsViewNotEditor && !IsDialogOpen && !mIsGuideOpen;
+        public bool AllowHistoryCommands => !IsViewNotEditor && IsTitleBarEnabled;
+
+        public bool IsTitleBarEnabled => !IsDialogOpen && !mIsGuideOpen;
 
         public bool IsViewNotEditor => !(mContent is LayoutEditor) && App.Settings.WelcomeScreenShown;
 
@@ -297,6 +302,7 @@ public bool IsGuideOpen
             {
                 mIsGuideOpen = value;
                 InvokePropertyChanged();
+                InvokePropertyChanged(nameof(IsTitleBarEnabled));
             }
         }