diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml
index e894bcff..a933b382 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml
@@ -3,10 +3,10 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 xmlns:ignore="http://www.galasoft.ch/ignore"
-			 xmlns:viewModel="clr-namespace:InvvardDev.EZLayoutDisplay.Desktop.ViewModel"
-			 xmlns:converter="clr-namespace:InvvardDev.EZLayoutDisplay.Desktop.View.Converter"
-			 ShutdownMode="OnExplicitShutdown"
+             xmlns:ignore="http://www.galasoft.ch/ignore"
+             xmlns:viewModel="clr-namespace:InvvardDev.EZLayoutDisplay.Desktop.ViewModel"
+             xmlns:converter="clr-namespace:InvvardDev.EZLayoutDisplay.Desktop.View.Converter"
+             ShutdownMode="OnExplicitShutdown"
              StartupUri="View/MainWindow.xaml"
              mc:Ignorable="d ignore">
 
@@ -14,15 +14,22 @@
         <ResourceDictionary>
             <!--Global View Model Locator-->
             <viewModel:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
-            <converter:KeyCodeToCharConverter x:Key="KeyCodeConverter" />
+
             <BitmapImage x:Key="WindowIcon" UriSource="Skins/Images/tray_base.ico" />
             <BitmapImage x:Key="TrayIcon" UriSource="Skins/Images/tray_base.ico" />
-            <SolidColorBrush x:Key="WindowBackgroundBrush" Color="WhiteSmoke"/>
+
+            <SolidColorBrush x:Key="WindowBackgroundBrush" Color="WhiteSmoke" />
+
+            <converter:KeyCodeToCharConverter x:Key="KeyCodeConverter" />
+            <converter:BoolToVisibilityConverter x:Key="BoolToHiddenConverter"
+                                                 TrueValue="Visible" FalseValue="Hidden" />
+            <converter:BoolToVisibilityConverter x:Key="BoolToVisibleConverter"
+                                                 TrueValue="Hidden" FalseValue="Visible" />
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Skins/KeyboardLayoutSkin.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
 
     </Application.Resources>
-    
-</Application>
+
+</Application>
\ No newline at end of file
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj b/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj
index 3021ffcc..a2e5e6e4 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj
@@ -152,6 +152,7 @@
     <Compile Include="View\AboutWindow.xaml.cs">
       <DependentUpon>AboutWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Converter\BoolToVisibilityConverter.cs" />
     <Compile Include="View\Converter\KeyCodeToCharConverter.cs" />
     <Compile Include="View\SettingsWindow.xaml.cs">
       <DependentUpon>SettingsWindow.xaml</DependentUpon>
@@ -249,6 +250,9 @@
     <Resource Include="Skins\Images\github-logo.png" />
     <Resource Include="Skins\Images\twitter-logo.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Skins\Images\warning-sign.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/Images/warning-sign.png b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/Images/warning-sign.png
new file mode 100644
index 00000000..b109362e
Binary files /dev/null and b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/Images/warning-sign.png differ
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/Converter/BoolToVisibilityConverter.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/View/Converter/BoolToVisibilityConverter.cs
new file mode 100644
index 00000000..7b69862f
--- /dev/null
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/Converter/BoolToVisibilityConverter.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace InvvardDev.EZLayoutDisplay.Desktop.View.Converter
+{
+    [ ValueConversion(typeof(bool), typeof(Visibility)) ]
+    public sealed class BoolToVisibilityConverter : IValueConverter
+    {
+        public Visibility TrueValue { get; set; }
+        public Visibility FalseValue { get; set; }
+
+        public BoolToVisibilityConverter()
+        {
+            // set defaults
+            TrueValue = Visibility.Visible;
+            FalseValue = Visibility.Collapsed;
+        }
+
+        public object Convert(object      value,
+                              Type        targetType,
+                              object      parameter,
+                              CultureInfo culture)
+        {
+            if (!(value is bool)) return null;
+
+            return (bool) value ? TrueValue : FalseValue;
+        }
+
+        public object ConvertBack(object      value,
+                                  Type        targetType,
+                                  object      parameter,
+                                  CultureInfo culture)
+        {
+            if (Equals(value, TrueValue)) return true;
+            if (Equals(value, FalseValue)) return false;
+
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
index 8ac3732d..fb5b06ea 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/DisplayLayoutWindow.xaml
@@ -7,9 +7,9 @@
     xmlns:command="http://www.galasoft.ch/mvvmlight"
     x:Class="InvvardDev.EZLayoutDisplay.Desktop.View.DisplayLayoutWindow"
     mc:Ignorable="d" Height="423" Width="1075"
-    WindowStartupLocation="CenterScreen" Topmost="True"
+    WindowStartupLocation="CenterScreen" Topmost="{Binding IsTopMost}"
     ResizeMode="NoResize" Visibility="Visible" ShowInTaskbar="True"
-    WindowStyle="None"  Background="{StaticResource WindowBackgroundBrush}"
+    WindowStyle="None" Background="{StaticResource WindowBackgroundBrush}"
     Title="{Binding WindowTitle}" Icon="{StaticResource WindowIcon}"
     DataContext="{Binding DisplayLayout, Source={StaticResource Locator}}">
 
@@ -23,12 +23,29 @@
         <KeyBinding Key="Space" Command="{Binding NextLayerCommand, Mode=OneWay}" />
     </Window.InputBindings>
 
-    <ItemsControl ItemsSource="{Binding CurrentLayoutTemplate}"
-                  ItemTemplateSelector="{StaticResource KeyContentTemplateSelector}">
-        <ItemsControl.ItemsPanel>
-            <ItemsPanelTemplate>
-                <Canvas Margin="10" />
-            </ItemsPanelTemplate>
-        </ItemsControl.ItemsPanel>
-    </ItemsControl>
+    <Grid>
+        <ItemsControl ItemsSource="{Binding CurrentLayoutTemplate}"
+                      ItemTemplateSelector="{StaticResource KeyContentTemplateSelector}"
+                      Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToVisibleConverter}}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <Canvas Margin="10" />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+        <Grid Visibility="{Binding NoLayoutAvailable, Converter={StaticResource BoolToHiddenConverter}}" Width="350">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width=".25*"/>
+                <ColumnDefinition Width="10"/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.Column="0" Source="../Skins/Images/warning-sign.png"/>
+            <TextBlock Grid.Column="2" TextWrapping="WrapWithOverflow" FontSize="18" VerticalAlignment="Center" HorizontalAlignment="Left">
+                <Run Text="No layout available !"/>
+                <LineBreak/>
+                <Run Text="Please, go to the settings and update the layout."/>
+            </TextBlock>
+        </Grid>
+    </Grid>
+
 </Window>
\ No newline at end of file
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/SettingsWindow.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/View/SettingsWindow.xaml
index c8dc2dcf..c0e0d56c 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/SettingsWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/SettingsWindow.xaml
@@ -25,12 +25,15 @@
         <TextBox TextWrapping="NoWrap"
                  Text="{Binding LayoutUrlContent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Grid.Column="1"
                  Grid.Row="0" Margin="5,5,0,5" Grid.ColumnSpan="2" />
-        <Button Content="{Binding CancelCommandLabel}" HorizontalAlignment="Left" Width="75" d:LayoutOverrides="Height"
-                Grid.Row="1" Command="{Binding CancelSettingsCommand, Mode=OneWay}" />
-        <Button Content="{Binding ApplyCommandLabel}" Width="75" d:LayoutOverrides="Height" Grid.Row="1"
+        <Button Content="{Binding CancelCommandLabel}" HorizontalAlignment="Left" Width="75"
+                Grid.Row="1" Command="{Binding CancelSettingsCommand}" />
+        <Button Content="{Binding UpdateCommandLabel}" Width="75" Grid.Row="1"
+                Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,85,0"
+                Command="{Binding UpdateLayoutCommand}" />
+        <Button Content="{Binding ApplyCommandLabel}" Width="75" Grid.Row="1"
                 Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,5,0"
-                Command="{Binding ApplySettingsCommand, Mode=OneWay}" />
-        <Button Content="{Binding CloseCommandLabel}" Command="{Binding CloseSettingsCommand, Mode=OneWay}" Width="75"
+                Command="{Binding ApplySettingsCommand}" />
+        <Button Content="{Binding CloseCommandLabel}" Command="{Binding CloseSettingsCommand}" Width="75"
                 HorizontalAlignment="Right" Grid.Row="1" Grid.Column="2" Margin="5,0,0,0" />
 
     </Grid>
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
index 983bd2d9..7cd6da53 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/DisplayLayoutViewModel.cs
@@ -35,6 +35,7 @@ public class DisplayLayoutViewModel : ViewModelBase
         private EZLayout _ezLayout;
 
         private string _windowTitle;
+        private bool _noLayoutAvailable;
 
         #endregion
 
@@ -49,6 +50,15 @@ public string WindowTitle
             set => Set(ref _windowTitle, value);
         }
 
+        /// <summary>
+        /// Gets or sets the no layout available indicator.
+        /// </summary>
+        public bool NoLayoutAvailable
+        {
+            get => _noLayoutAvailable;
+            set => Set(ref _noLayoutAvailable, value);
+        }
+
         /// <summary>
         /// Gets or sets the layout template.
         /// </summary>
@@ -123,14 +133,15 @@ private async void LoadCompleteLayout()
 
             _layoutTemplates = new List<List<KeyTemplate>>();
 
-            if (IsInDesignModeStatic // in DesignMode, everything is already set
-                || _ezLayout?.EZLayers == null
+            if (_ezLayout?.EZLayers == null
                 || !_ezLayout.EZLayers.Any()
                 || !_ezLayout.EZLayers.SelectMany(l => l.EZKeys).Any())
             {
+                NoLayoutAvailable = true;
                 return;
             }
 
+            NoLayoutAvailable = false;
             await PopulateLayoutTemplates();
 
             SwitchLayer();
@@ -138,6 +149,8 @@ private async void LoadCompleteLayout()
 
         private void LoadDesignTimeModel()
         {
+            NoLayoutAvailable = true;
+
             var json = Encoding.Default.GetString(Resources.layoutDefinition);
             var layoutDefinition = JsonConvert.DeserializeObject<IEnumerable<KeyTemplate>>(json) as List<KeyTemplate>;
 
@@ -152,10 +165,16 @@ private void LoadDesignTimeModel()
                                                            KeyCategory = KeyCategory.DualFunction
                                                        };
 
-            for (int i = 1 ; i < CurrentLayoutTemplate.Count ; i++)
+            CurrentLayoutTemplate[1].EZKey = new EZKey {
+                                                           Label = new KeyLabel("LT \u2192 1"),
+                                                           DisplayType = KeyDisplayType.SimpleLabel,
+                                                           KeyCategory = KeyCategory.DualFunction
+                                                       };
+
+            for (int i = 2 ; i < CurrentLayoutTemplate.Count ; i++)
             {
                 CurrentLayoutTemplate[i].EZKey = new EZKey {
-                                                               Label = new KeyLabel("A \u2192"),
+                                                               Label = new KeyLabel("E"),
                                                                Modifier = new KeyLabel("Left Shift")
                                                            };
             }
@@ -191,6 +210,7 @@ private void SwitchLayer()
             }
         }
 
+
         #region Delegates
 
         private void LoadCompleteLayout(UpdatedLayoutMessage obj)
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/SettingsViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/SettingsViewModel.cs
index d91b8a04..f9338d35 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/SettingsViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/SettingsViewModel.cs
@@ -27,6 +27,7 @@ public class SettingsViewModel : ViewModelBase
 
         private string _windowTitle;
         private string _applyCommandLabel;
+        private string _updateCommandLabel;
         private string _closeCommandLabel;
         private string _cancelCommandLabel;
         private string _layoutUrlLabel;
@@ -62,7 +63,7 @@ public class SettingsViewModel : ViewModelBase
         /// </summary>
         public ICommand UpdateLayoutCommand =>
             _updateLayoutCommand
-            ?? (_updateLayoutCommand = new RelayCommand(async () => await UpdateLayout()));
+            ?? (_updateLayoutCommand = new RelayCommand(SaveSettings));
 
         /// <summary>
         /// Closes the settings window.
@@ -87,6 +88,12 @@ public string ApplyCommandLabel
             set => Set(ref _applyCommandLabel, value);
         }
 
+        public string UpdateCommandLabel
+        {
+            get => _updateCommandLabel;
+            set => Set(ref _updateCommandLabel, value);
+        }
+
         public string CloseCommandLabel
         {
             get => _closeCommandLabel;
@@ -170,6 +177,7 @@ private void SetLabelUi()
             WindowTitle = "Settings";
             LayoutUrlLabel = "Configurator URL to your layout :";
             ApplyCommandLabel = "Apply";
+            UpdateCommandLabel = "Update";
             CloseCommandLabel = "Close";
             CancelCommandLabel = "Cancel";
             HotkeyTitleLabel = "Hotkey to display layout";