diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/App.config b/src/InvvardDev.EZLayoutDisplay.Desktop/App.config
index 91b7abd6..9b76f990 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/App.config
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/App.config
@@ -21,7 +21,7 @@
   <userSettings>
     <InvvardDev.EZLayoutDisplay.Desktop.Properties.Settings>
       <setting name="ErgodoxLayoutUrl" serializeAs="String">
-        <value>https://configure.ergodox-ez.com/layouts/default/latest/0</value>
+        <value>https://configure.ergodox-ez.com/ergodox-ez/layouts/default/latest/0</value>
       </setting>
       <setting name="HotkeyShowLayout" serializeAs="String">
         <value>{"modifiers":[0,1,2,4],"keycode":32}</value>
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml
index a06a2aea..85070d01 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/App.xaml
@@ -20,6 +20,23 @@
 
             <SolidColorBrush x:Key="WindowBackgroundBrush" Color="WhiteSmoke" />
 
+            <Style TargetType="Button" x:Key="HyperlinkStyledButton">
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="Button">
+                            <TextBlock Foreground="#FF0066CC"
+                                       Text="{TemplateBinding Content}"
+                                       TextDecorations="Underline"
+                                       FontFamily="Segoe UI"
+                                       FontSize="15"
+                                       Cursor="Hand" />
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="Margin" Value="5,0,0,0" />
+            </Style>
+
             <converter:KeyCodeToCharConverter x:Key="KeyCodeConverter" />
 
             <converter:BoolToVisibilityConverter x:Key="BoolToHiddenConverter"
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj b/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj
index d5f60982..2adefc97 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/InvvardDev.EZLayoutDisplay.Desktop.csproj
@@ -110,6 +110,7 @@
     <Compile Include="Helper\KeyContentTemplateSelector.cs" />
     <Compile Include="Helper\LoggerHelper.cs" />
     <Compile Include="Model\Enum\KeyDisplayType.cs" />
+    <Compile Include="Model\ErgodoxTag.cs" />
     <Compile Include="Model\KeyTemplate.cs" />
     <Compile Include="Model\Messenger\UpdatedLayoutMessage.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -174,6 +175,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Skins\SettingsSkin.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\AboutWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Model/ErgodoxLayer.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/Model/ErgodoxLayer.cs
index d256a134..d6d64322 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Model/ErgodoxLayer.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Model/ErgodoxLayer.cs
@@ -34,5 +34,10 @@ public class ErgodoxLayer
         /// </summary>
         [JsonProperty("color")]
         public string Color { get; set; }
+
+        public override string ToString()
+        {
+            return $"{Title} {Position}";
+        }
     }
 }
\ No newline at end of file
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Model/ErgodoxLayout.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/Model/ErgodoxLayout.cs
index e9c633f5..b565dec3 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Model/ErgodoxLayout.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Model/ErgodoxLayout.cs
@@ -11,12 +11,24 @@ public class ErgodoxLayout
         [JsonProperty("hashId")]
         public string HashId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the keyboard geometry.
+        /// </summary>
+        [JsonProperty("geometry")]
+        public string Geometry { get; set; }
+
         /// <summary>
         /// Gets or sets the layout title.
         /// </summary>
         [JsonProperty("title")]
         public string Title { get; set; }
 
+        /// <summary>
+        /// Gets or sets the keyboard tags.
+        /// </summary>
+        [JsonProperty("tags", NullValueHandling = NullValueHandling.Ignore)]
+        public List<ErgodoxTag> Tags { get; set; }
+
         /// <summary>
         /// Gets or sets the list of <see cref="Revision"/>.
         /// </summary>
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Model/ErgodoxTag.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/Model/ErgodoxTag.cs
new file mode 100644
index 00000000..bda5b2b7
--- /dev/null
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Model/ErgodoxTag.cs
@@ -0,0 +1,13 @@
+using Newtonsoft.Json;
+
+namespace InvvardDev.EZLayoutDisplay.Desktop.Model
+{
+    public class ErgodoxTag
+    {
+        /// <summary>
+        /// Gets or sets the tag name.
+        /// </summary>
+        [JsonProperty("name")]
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Model/Revision.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/Model/Revision.cs
index 3b72cfb1..9ebd2b67 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Model/Revision.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Model/Revision.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace InvvardDev.EZLayoutDisplay.Desktop.Model
@@ -11,6 +12,18 @@ public class Revision
         [JsonProperty("hashId")]
         public string HashId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the keyboard layout HEX file URL.
+        /// </summary>
+        [JsonProperty("hexUrl")]
+        public string HexUrl { get; set; }
+
+        /// <summary>
+        /// Gets or sets the keyboard layout sources zip URL.
+        /// </summary>
+        [JsonProperty("zipUrl")]
+        public string SourcesUrl { get; set; }
+
         /// <summary>
         /// Gets or sets the keyboard model.
         /// </summary>
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Properties/Settings.Designer.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/Properties/Settings.Designer.cs
index 20fee19f..d0cabd01 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Properties/Settings.Designer.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace InvvardDev.EZLayoutDisplay.Desktop.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
     public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -25,7 +25,7 @@ public static Settings Default {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("https://configure.ergodox-ez.com/layouts/default/latest/0")]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://configure.ergodox-ez.com/ergodox-ez/layouts/default/latest/0")]
         public string ErgodoxLayoutUrl {
             get {
                 return ((string)(this["ErgodoxLayoutUrl"]));
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Properties/Settings.settings b/src/InvvardDev.EZLayoutDisplay.Desktop/Properties/Settings.settings
index cea1e0ac..d45dd66c 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Properties/Settings.settings
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Properties/Settings.settings
@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="ErgodoxLayoutUrl" Type="System.String" Scope="User">
-      <Value Profile="(Default)">https://configure.ergodox-ez.com/layouts/default/latest/0</Value>
+      <Value Profile="(Default)">https://configure.ergodox-ez.com/ergodox-ez/layouts/default/latest/0</Value>
     </Setting>
     <Setting Name="HotkeyShowLayout" Type="System.String" Scope="User">
       <Value Profile="(Default)">{"modifiers":[0,1,2,4],"keycode":32}</Value>
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Design/LayoutService.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Design/LayoutService.cs
index 0e33a8db..a0c06ff3 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Design/LayoutService.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Design/LayoutService.cs
@@ -8,6 +8,16 @@ namespace InvvardDev.EZLayoutDisplay.Desktop.Service.Design
 {
     public class LayoutService : ILayoutService
     {
+        public async Task<ErgodoxLayout> GetLayoutInfo(string layoutHashId)
+        {
+            Debug.WriteLine("Layout retrieved.");
+
+            var layoutInfo = new ErgodoxLayout();
+            layoutInfo.Title = "Layout title v1.0";
+
+            return await new Task<ErgodoxLayout>(() => layoutInfo);
+        }
+
         /// <inheritdoc />
         public async Task<ErgodoxLayout> GetErgodoxLayout(string layoutHashId)
         {
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Implementation/LayoutService.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Implementation/LayoutService.cs
index aac4a309..4fff868e 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Implementation/LayoutService.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Implementation/LayoutService.cs
@@ -15,50 +15,37 @@ namespace InvvardDev.EZLayoutDisplay.Desktop.Service.Implementation
     public class LayoutService : ILayoutService
     {
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+
         private readonly string GetLayoutBody =
             "{{\"operationName\":\"getLayout\",\"variables\":{{\"hashId\":\"{0}\"}},\"query\":\"query getLayout($hashId: String!) {{\\n Layout(hashId: $hashId) {{\\n ...LayoutData\\n }}\\n}}\\n\\nfragment LayoutData on Layout {{\\n hashId\\n title\\n revisions {{\\n hashId\\n model\\n layers {{\\n hashId\\n keys\\n position\\n title\\n color\\n }}\\n}}\\n}}\\n\"}}";
 
+        private readonly string GetLayoutInfoRequestBody =
+            "{{\"operationName\":\"getLayout\",\"variables\":{{\"hashId\":\"{0}\"}},\"query\":\"query getLayout($hashId: String!) {{\\n Layout(hashId: $hashId) {{\\n ...LayoutData\\n __typename\\n }}\\n}}\\n\\nfragment LayoutData on Layout {{\\n geometry\\n hashId\\n title\\n tags {{\\n id\\n hashId\\n name\\n }}\\n revisions {{\\n hexUrl\\n model\\n zipUrl\\n layers {{\\n position\\n title\\n }}\\n }}\\n __typename\\n}}\\n\"}}";
+
         private const string GetLayoutRequestUri = "https://oryx.ergodox-ez.com/graphql";
 
         #region ILayoutService implementation
 
         /// <inheritdoc />
-        public async Task<ErgodoxLayout> GetErgodoxLayout(string layoutHashId)
+        public async Task<ErgodoxLayout> GetLayoutInfo(string layoutHashId)
         {
             Logger.TraceMethod();
             Logger.DebugInputParam(nameof(layoutHashId), layoutHashId);
 
-            if (string.IsNullOrWhiteSpace(layoutHashId))
-            {
-                Logger.Error("Layout {0} was not found", layoutHashId);
-                // ReSharper disable once LocalizableElement
-                throw new ArgumentNullException(nameof(layoutHashId), $"Layout hash ID '{layoutHashId}' was not found.");
-            }
-
-            DataRoot layout;
-
-            using (HttpClient client = new HttpClient())
-            {
-                var body = string.Format(GetLayoutBody, layoutHashId);
-                Logger.Debug("Request body : {@body}", body);
-
-                var response = await client.PostAsync(GetLayoutRequestUri, new StringContent(body, Encoding.UTF8, "application/json"));
-                Logger.Debug("Response : {@response}", response);
-
-                var result = await response.Content.ReadAsStringAsync();
-                Logger.Debug("Content result : {@result}", result);
+            var info = await QueryData(layoutHashId, GetLayoutInfoRequestBody);
+            
+            return info;
+        }
 
-                layout = JsonConvert.DeserializeObject<DataRoot>(result);
-                Logger.Debug("Deserialized layout : {@layout}", layout);
+        /// <inheritdoc />
+        public async Task<ErgodoxLayout> GetErgodoxLayout(string layoutHashId)
+        {
+            Logger.TraceMethod();
+            Logger.DebugInputParam(nameof(layoutHashId), layoutHashId);
 
-                if (layout?.LayoutRoot?.Layout == null)
-                {
-                    Logger.Error("Layout {0} does not exist", layoutHashId);
-                    throw new ArgumentException(layoutHashId, $"Hash ID \"{layoutHashId}\" does not exist");
-                }
-            }
+            var layout = await QueryData(layoutHashId, GetLayoutBody);
 
-            return layout.LayoutRoot.Layout;
+            return layout;
         }
 
         /// <inheritdoc />
@@ -80,11 +67,60 @@ public async Task<IEnumerable<KeyTemplate>> GetLayoutTemplate()
             IEnumerable<KeyTemplate> layoutTemplate = await ReadLayoutDefinition();
 
             return layoutTemplate;
+        }
+
+        #endregion
+
+        #region Private methods
+
+        private async Task<ErgodoxLayout> QueryData(string layoutHashId, string graphQlQuery)
+        {
+            ValidateLayoutHashId(layoutHashId);
+
+            var requestBody = string.Format(graphQlQuery, layoutHashId);
+
+            var layout = await HttpClientCall(requestBody);
+
+            if (layout?.LayoutRoot?.Layout == null)
+            {
+                Logger.Error("Layout {0} does not exist", layoutHashId);
+
+                throw new ArgumentException(layoutHashId, $"Hash ID \"{layoutHashId}\" does not exist");
+            }
+
+            return layout.LayoutRoot.Layout;
         }
 
-        #endregion
+        private static void ValidateLayoutHashId(string layoutHashId)
+        {
+            if (!string.IsNullOrWhiteSpace(layoutHashId)) return;
 
-        #region Private methods
+            Logger.Error("Layout {0} was not found", layoutHashId);
+
+            // ReSharper disable once LocalizableElement
+            throw new ArgumentNullException(nameof(layoutHashId), $"Layout hash ID '{layoutHashId}' was not found.");
+        }
+
+        private async Task<DataRoot> HttpClientCall(string requestBody)
+        {
+            DataRoot layout;
+
+            using (HttpClient client = new HttpClient())
+            {
+                Logger.Debug("Request body : {@body}", requestBody);
+
+                var response = await client.PostAsync(GetLayoutRequestUri, new StringContent(requestBody, Encoding.UTF8, "application/json"));
+                Logger.Debug("Response : {@response}", response);
+
+                var result = await response.Content.ReadAsStringAsync();
+                Logger.Debug("Content result : {@result}", result);
+
+                layout = JsonConvert.DeserializeObject<DataRoot>(result);
+                Logger.Debug("Deserialized layout : {@layout}", layout);
+            }
+
+            return layout;
+        }
 
         private async Task<IEnumerable<KeyTemplate>> ReadLayoutDefinition()
         {
@@ -93,16 +129,17 @@ private async Task<IEnumerable<KeyTemplate>> ReadLayoutDefinition()
             if (Resources.layoutDefinition.Length <= 0)
             {
                 Logger.Warn("Layout definition is empty");
+
                 return new List<KeyTemplate>();
             }
 
             var layoutTemplate = await Task.Run(() => {
-                                              var json = Encoding.Default.GetString(Resources.layoutDefinition);
+                                                    var json = Encoding.Default.GetString(Resources.layoutDefinition);
 
-                                              var layoutDefinition = JsonConvert.DeserializeObject<IEnumerable<KeyTemplate>>(json);
+                                                    var layoutDefinition = JsonConvert.DeserializeObject<IEnumerable<KeyTemplate>>(json);
 
-                                              return layoutDefinition;
-                                          });
+                                                    return layoutDefinition;
+                                                });
 
             Logger.DebugOutputParam(nameof(layoutTemplate), layoutTemplate);
 
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Interface/ILayoutService.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Interface/ILayoutService.cs
index 3e413026..da07a72f 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Interface/ILayoutService.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Service/Interface/ILayoutService.cs
@@ -6,6 +6,13 @@ namespace InvvardDev.EZLayoutDisplay.Desktop.Service.Interface
 {
     public interface ILayoutService
     {
+        /// <summary>
+        /// Gets the <see cref="ErgodoxLayout"/> basic info.
+        /// </summary>
+        /// <param name="layoutHashId">The layout hash ID to get.</param>
+        /// <returns>The <see cref="ErgodoxLayout"/>.</returns>
+        Task<ErgodoxLayout> GetLayoutInfo(string layoutHashId);
+
         /// <summary>
         /// Gets the <see cref="ErgodoxLayout"/>.
         /// </summary>
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/AboutSkin.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/AboutSkin.xaml
index 1b48b310..1620afc6 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/AboutSkin.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/AboutSkin.xaml
@@ -29,21 +29,4 @@
         <Setter Property="Margin" Value="5,0,0,0" />
     </Style>
 
-    <Style TargetType="Button" x:Key="HyperlinkStyledButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <TextBlock Foreground="#FF0066CC"
-                               Text="{TemplateBinding Content}"
-                               TextDecorations="Underline"
-                               FontFamily="Segoe UI"
-                               FontSize="15"
-                               Cursor="Hand" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="5,0,0,0" />
-    </Style>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/SettingsSkin.xaml b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/SettingsSkin.xaml
new file mode 100644
index 00000000..f7213c86
--- /dev/null
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/Skins/SettingsSkin.xaml
@@ -0,0 +1,45 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="TitleLabelStyle" TargetType="Label">
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+    </Style>
+
+    <Style x:Key="ListViewStyle" TargetType="ListView">
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled"/>
+        <Setter Property="Background" Value="{x:Null}"/>
+        <Setter Property="BorderBrush" Value="{x:Null}"/>
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
+    </Style>
+
+    <Style x:Key="LvLayersStyle" TargetType="ListView" BasedOn="{StaticResource ListViewStyle}">
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="-7,0,0,0"/>
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <Label Content="{Binding}" Padding="5,0,0,0" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="LvTagsStyle" TargetType="ListView" BasedOn="{StaticResource ListViewStyle}">
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <WrapPanel Background="Transparent" Orientation="Horizontal" />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <Button Style="{StaticResource HyperlinkStyledButton}" Content="{Binding}"
+                            Command="{Binding ElementName=LvTags, Path=DataContext.OpenTagSearchCommand}"
+                            CommandParameter="{Binding}"/>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ 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 4fd469f1..7b168a07 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/SettingsWindow.xaml
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/SettingsWindow.xaml
@@ -3,37 +3,93 @@
         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:model="clr-namespace:InvvardDev.EZLayoutDisplay.Desktop.Model"
         mc:Ignorable="d" Background="{StaticResource WindowBackgroundBrush}"
         Title="{Binding WindowTitle}" Icon="{StaticResource WindowIcon}"
-        Width="600" Height="100" MinWidth="500" MinHeight="100"
-        WindowStartupLocation="CenterScreen" ResizeMode="NoResize"
+        Width="630" Height="340" MinWidth="630" MinHeight="300"
+        WindowStartupLocation="CenterScreen"
         DataContext="{Binding Settings, Source={StaticResource Locator}}">
 
+    <Window.Resources>
+        <ResourceDictionary Source="../Skins/SettingsSkin.xaml"/>
+    </Window.Resources>
+
     <Grid Margin="10,0,10,10">
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />
+            <RowDefinition Height="*" />
             <RowDefinition Height="20" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="200" />
+            <ColumnDefinition Width="180" />
+            <ColumnDefinition />
             <ColumnDefinition />
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
         <Label Content="{Binding LayoutUrlLabel}" d:LayoutOverrides="Height" HorizontalAlignment="Left"
                VerticalAlignment="Center" />
-        <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"  Grid.Column="0"
-                Grid.Row="1" Command="{Binding CancelSettingsCommand}" />
-        <Button Content="{Binding UpdateCommandLabel}" Width="75" Grid.Row="1" x:Name="btnUpdate"
-                Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,85,0"
-                Command="{Binding UpdateLayoutCommand}" Visibility="Hidden" IsEnabled="False" />
-        <Button Content="{Binding ApplyCommandLabel}" Width="75" Grid.Row="1"
-                Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,5,0"
-                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" />
+
+        <TextBox TextWrapping="NoWrap" HorizontalAlignment="Stretch" Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2"
+                 Margin="5,5,0,5"
+                 Text="{Binding LayoutUrlContent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Delay=650}" />
+
+        <GroupBox Header="{Binding LayoutInfoGroupName}" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3"
+                  Margin="0,0,0,5">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="30" />
+                    <RowDefinition Height="30" />
+                    <RowDefinition Height="30" />
+                    <RowDefinition />
+                    <RowDefinition Height="45" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="120" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="120" />
+                </Grid.ColumnDefinitions>
+
+                <Label Content="{Binding LayoutTitleLabel}" Style="{StaticResource TitleLabelStyle}" />
+                <Label Content="{Binding KeyboardModelLabel}" Grid.Row="1" Grid.Column="0"
+                       Style="{StaticResource TitleLabelStyle}" />
+                <Label Content="{Binding StatusLabel}" Grid.Row="2" Grid.Column="0" Style="{StaticResource TitleLabelStyle}" />
+                <Label Content="{Binding LayersLabel}" Grid.Row="3" Grid.Column="0" Style="{StaticResource TitleLabelStyle}" />
+                <Label Content="{Binding TagsLabel}" Grid.Row="4" Grid.Column="0" Style="{StaticResource TitleLabelStyle}" />
+
+                <Label Content="{Binding LayoutTitle}" Grid.Row="0" Grid.Column="1" />
+                <Label Content="{Binding KeyboardModel}" Grid.Row="1" Grid.Column="1" />
+                <Label Content="{Binding LayoutStatus}" Grid.Row="2" Grid.Column="1" />
+
+                <ListView x:Name="LvLayers" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="2"
+                          Style="{StaticResource LvLayersStyle}" ItemsSource="{Binding Layers}" />
+
+                <ListView x:Name="LvTags" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2"
+                          Style="{StaticResource LvTagsStyle}" ItemsSource="{Binding Tags}"/>
+
+                <StackPanel x:Name="SpLayoutButtons" Grid.Row="0" Grid.RowSpan="3" Grid.Column="2">
+                    <Button Content="{Binding HexFileCommandLabel}" Height="40" Command="{Binding DownloadHexFileCommand}" Margin="5,0,5,5" />
+                    <Button Content="{Binding SourcesZipCommandLabel}" Height="40" Command="{Binding DownloadSourcesCommand}" Margin="5,0" />
+                </StackPanel>
+
+            </Grid>
+        </GroupBox>
+
+        <StackPanel Grid.ColumnSpan="4" Grid.Row="2" Grid.Column="0"
+                    Orientation="Horizontal" Height="20" HorizontalAlignment="Right">
+
+            <Button Content="{Binding UpdateCommandLabel}" Width="75" x:Name="BtnUpdate"
+                    Command="{Binding UpdateLayoutCommand}" IsEnabled="False"
+                    d:LayoutOverrides="TopPosition, BottomPosition" Margin="0" />
+            <Button Content="{Binding CancelCommandLabel}" Width="75"
+                    Command="{Binding CancelSettingsCommand}"
+                    d:LayoutOverrides="LeftPosition, RightPosition, TopPosition, BottomPosition" Margin="5,0,0,0" />
+            <Button Content="{Binding ApplyCommandLabel}" Width="75"
+                    Command="{Binding ApplySettingsCommand}" d:LayoutOverrides="TopPosition, BottomPosition"
+                    Margin="5,0,0,0" />
+            <Button Content="{Binding CloseCommandLabel}" Command="{Binding CloseSettingsCommand}" Width="75"
+                    d:LayoutOverrides="TopPosition, BottomPosition" HorizontalAlignment="Right" Margin="5,0,0,0" />
+
+        </StackPanel>
 
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/View/SettingsWindow.xaml.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/View/SettingsWindow.xaml.cs
index 0e524495..16f755ba 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/View/SettingsWindow.xaml.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/View/SettingsWindow.xaml.cs
@@ -9,11 +9,11 @@ public partial class SettingsWindow
     {
         public SettingsWindow()
         {
-            InitializeComponent();
+                InitializeComponent();
 
 #if DEBUG
-            btnUpdate.IsEnabled = true;
-            btnUpdate.Visibility = Visibility.Visible;
+            BtnUpdate.IsEnabled = true;
+            BtnUpdate.Visibility = Visibility.Visible;
 #endif
         }
     }
diff --git a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/SettingsViewModel.cs b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/SettingsViewModel.cs
index dcb1a43d..7dc3b399 100644
--- a/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/SettingsViewModel.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/SettingsViewModel.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Collections.ObjectModel;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows.Input;
@@ -16,6 +18,12 @@ namespace InvvardDev.EZLayoutDisplay.Desktop.ViewModel
 {
     public class SettingsViewModel : ViewModelBase
     {
+        #region Constants
+
+        private const string TagSearchBaseUri = "https://configure.ergodox-ez.com/{0}/search?q={1}";
+
+        #endregion
+
         #region Fields
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
@@ -23,19 +31,26 @@ public class SettingsViewModel : ViewModelBase
         private readonly ISettingsService _settingsService;
         private readonly IWindowService _windowService;
         private readonly ILayoutService _layoutService;
+        private readonly IProcessService _processService;
 
+        private ICommand _openTagSearchCommand;
+        private ICommand _downloadHexFileCommand;
+        private ICommand _downloadSourcesCommand;
         private ICommand _applySettingsCommand;
         private ICommand _updateLayoutCommand;
         private ICommand _closeSettingsCommand;
         private ICommand _cancelSettingsCommand;
 
-        private string _windowTitle;
-        private string _applyCommandLabel;
-        private string _updateCommandLabel;
-        private string _closeCommandLabel;
-        private string _cancelCommandLabel;
-        private string _layoutUrlLabel;
-        private string _hotkeyTitleLabel;
+        private string _layoutTitle;
+        private string _keyboardModel;
+        private string _layoutStatus;
+        private ObservableCollection<string> _tags;
+        private ObservableCollection<string> _layers;
+        private string _hexFileUri;
+        private string _sourcesZipUri;
+        private bool _layoutIsCompiled;
+        private string _keyboardGeometry;
+
         private string _altModifierLabel;
         private string _ctrlModifierLabel;
         private string _shiftModifierLabel;
@@ -48,6 +63,27 @@ public class SettingsViewModel : ViewModelBase
 
         #region Relay commands
 
+        /// <summary>
+        /// Open tag search command.
+        /// </summary>
+        public ICommand OpenTagSearchCommand =>
+            _openTagSearchCommand
+            ?? (_openTagSearchCommand = new RelayCommand<string>(OpenTagSearchUrl));
+
+        /// <summary>
+        /// Download HEX file.
+        /// </summary>
+        public ICommand DownloadHexFileCommand =>
+            _downloadHexFileCommand
+            ?? (_downloadHexFileCommand = new RelayCommand(DownloadHexFile, LayoutIsCompiled));
+
+        /// <summary>
+        /// Download Sources ZIP.
+        /// </summary>
+        public ICommand DownloadSourcesCommand =>
+            _downloadSourcesCommand
+            ?? (_downloadSourcesCommand = new RelayCommand(DownloadSources, LayoutIsCompiled));
+
         /// <summary>
         /// Cancel settings edition.
         /// </summary>
@@ -80,60 +116,78 @@ public class SettingsViewModel : ViewModelBase
 
         #region Properties
 
-        public string WindowTitle
-        {
-            get => _windowTitle;
-            set => Set(ref _windowTitle, value);
-        }
+        public string WindowTitle { get; set; }
 
-        public string ApplyCommandLabel
-        {
-            get => _applyCommandLabel;
-            set => Set(ref _applyCommandLabel, value);
-        }
+        public string LayoutInfoGroupName { get; set; }
 
-        public string UpdateCommandLabel
+        public string LayoutTitleLabel { get; set; }
+
+        public string KeyboardModelLabel { get; set; }
+
+        public string TagsLabel { get; set; }
+
+        public string StatusLabel { get; set; }
+
+        public string LayersLabel { get; set; }
+
+        public string HexFileCommandLabel { get; set; }
+
+        public string SourcesZipCommandLabel { get; set; }
+
+        public string ApplyCommandLabel { get; set; }
+
+        public string UpdateCommandLabel { get; set; }
+
+        public string CloseCommandLabel { get; set; }
+
+        public string CancelCommandLabel { get; set; }
+
+        public string LayoutUrlLabel { get; set; }
+
+        public string LayoutUrlContent
         {
-            get => _updateCommandLabel;
-            set => Set(ref _updateCommandLabel, value);
+            get => _layoutUrlContent;
+            set
+            {
+                if (!Set(ref _layoutUrlContent, value)) return;
+
+                UpdateButtonCanExecute();
+                UpdateErgoDoxInfo();
+            }
         }
 
-        public string CloseCommandLabel
+        public string LayoutTitle
         {
-            get => _closeCommandLabel;
-            set => Set(ref _closeCommandLabel, value);
+            get => _layoutTitle;
+            private set => Set(ref _layoutTitle, value);
         }
 
-        public string CancelCommandLabel
+        public string KeyboardModel
         {
-            get => _cancelCommandLabel;
-            set => Set(ref _cancelCommandLabel, value);
+            get => _keyboardModel;
+            private set => Set(ref _keyboardModel, value);
         }
 
-        public string LayoutUrlLabel
+        public string LayoutStatus
         {
-            get => _layoutUrlLabel;
-            set => Set(ref _layoutUrlLabel, value);
+            get => _layoutStatus;
+            private set => Set(ref _layoutStatus, value);
         }
 
-        public string HotkeyTitleLabel
+        public ObservableCollection<string> Tags
         {
-            get => _hotkeyTitleLabel;
-            private set => Set(ref _hotkeyTitleLabel, value);
+            get => _tags ?? (_tags = new ObservableCollection<string>());
+            private set => Set(ref _tags, value);
         }
 
-        public string LayoutUrlContent
+        public ObservableCollection<string> Layers
         {
-            get => _layoutUrlContent;
-            set
-            {
-                if (Set(ref _layoutUrlContent, value))
-                {
-                    UpdateButtonCanExecute();
-                }
-            }
+            get => _layers ?? (_layers = new ObservableCollection<string>());
+            private set => Set(ref _layers, value);
         }
 
+        public string HotkeyTitleLabel { get; set; }
+
         public string AltModifierLabel
         {
             get => _altModifierLabel;
@@ -168,15 +222,17 @@ private Hotkey HotkeyShowLayout
 
         #region Constructor
 
-        public SettingsViewModel(ISettingsService settingsService, IWindowService windowService, ILayoutService layoutService)
+        public SettingsViewModel(ISettingsService settingsService, IWindowService windowService, ILayoutService layoutService, IProcessService processService)
         {
             Logger.TraceConstructor();
 
             _settingsService = settingsService;
             _windowService = windowService;
             _layoutService = layoutService;
+            _processService = processService;
 
             SetLabelUi();
+            SetDesignTimeLabelUi();
 
             SetSettingControls();
         }
@@ -185,6 +241,16 @@ private void SetLabelUi()
         {
             WindowTitle = "Settings";
             LayoutUrlLabel = "Configurator URL to your layout :";
+
+            LayoutInfoGroupName = "Layout information";
+            LayoutTitleLabel = "Title :";
+            KeyboardModelLabel = "Keyboard model :";
+            TagsLabel = "Tags :";
+            StatusLabel = "Layout status :";
+            LayersLabel = "Layers :";
+            HexFileCommandLabel = "HEX File";
+            SourcesZipCommandLabel = "Sources zip";
+
             ApplyCommandLabel = "Apply";
             UpdateCommandLabel = "Update";
             CloseCommandLabel = "Close";
@@ -196,6 +262,26 @@ private void SetLabelUi()
             WindowsModifierLabel = "Windows";
         }
 
+        private void SetDesignTimeLabelUi()
+        {
+            if (!IsInDesignMode) return;
+
+            LayoutTitle = "Layout title v1.0";
+            KeyboardModel = "ErgoDox EZ Glow";
+            Tags = new ObservableCollection<string>() {
+                                                          "Tag 1",
+                                                          "Tag 2"
+                                                      };
+            LayoutStatus = "Compiled";
+            Layers = new ObservableCollection<string>() {
+                                                            "Layer 1",
+                                                            "Layer 2",
+                                                            "Layer 3",
+                                                            "Layer 4",
+                                                            "Layer 5"
+                                                        };
+        }
+
         private void SetSettingControls()
         {
             LayoutUrlContent = _settingsService.ErgodoxLayoutUrl;
@@ -204,7 +290,7 @@ private void SetSettingControls()
 
         #endregion
 
-        #region Private methods
+        #region Command handlers
 
         private async void SaveSettings()
         {
@@ -244,6 +330,33 @@ private void CloseSettingsWindow()
             _windowService.CloseWindow<SettingsWindow>();
         }
 
+        private void OpenTagSearchUrl(string tag)
+        {
+            Logger.TraceRelayCommand();
+
+            if (string.IsNullOrWhiteSpace(tag) || string.IsNullOrWhiteSpace(_keyboardGeometry))
+            {
+                return;
+            }
+
+            var tagSearchUri = string.Format(TagSearchBaseUri, _keyboardGeometry, tag);
+            _processService.StartWebUrl(tagSearchUri);
+        }
+
+        private void DownloadHexFile()
+        {
+            Logger.TraceRelayCommand();
+
+            _processService.StartWebUrl(_hexFileUri);
+        }
+
+        private void DownloadSources()
+        {
+            Logger.TraceRelayCommand();
+
+            _processService.StartWebUrl(_sourcesZipUri);
+        }
+
         private void UpdateButtonCanExecute()
         {
             Logger.TraceMethod();
@@ -259,13 +372,125 @@ private bool IsDirty()
             return isDirty;
         }
 
-        private async Task UpdateLayout()
+        private bool LayoutIsCompiled()
+        {
+            return _layoutIsCompiled;
+        }
+
+        #endregion
+
+        #region Private methods
+
+        private async void UpdateErgoDoxInfo()
         {
             Logger.TraceMethod();
 
             var layoutHashId = ExtractLayoutHashId(LayoutUrlContent);
 
-            Logger.Debug("Layout Hash ID = {0}", layoutHashId);
+            try
+            {
+                var layoutInfo = await _layoutService.GetLayoutInfo(layoutHashId);
+                Logger.Debug("LayoutInfo = {@value0}", layoutInfo);
+
+                ClearLayoutInfo();
+
+                if (layoutInfo != null)
+                {
+                    UpdateLayoutInfo(layoutInfo);
+                }
+            }
+            catch (ArgumentNullException anex)
+            {
+                Logger.Error(anex);
+                _windowService.ShowWarning(anex.Message);
+            }
+            catch (ArgumentException aex)
+            {
+                Logger.Error(aex);
+                _windowService.ShowWarning(aex.Message);
+            }
+        }
+
+        private void ClearLayoutInfo()
+        {
+            Tags.Clear();
+            Layers.Clear();
+
+            LayoutTitle = "";
+            KeyboardModel = "";
+            LayoutStatus = "";
+
+            _keyboardGeometry = "";
+            _layoutIsCompiled = false;
+        }
+
+        private void UpdateLayoutInfo(ErgodoxLayout layoutInfo)
+        {
+            Logger.TraceMethod();
+
+            LayoutTitle = layoutInfo.Title;
+            _keyboardGeometry = layoutInfo.Geometry;
+
+            if (layoutInfo.Tags?.Any() != null)
+            {
+                Tags = new ObservableCollection<string>(layoutInfo.Tags.Select(t => t.Name));
+            }
+
+            if (layoutInfo.Revisions?.Any() != null)
+            {
+                var revision = layoutInfo.Revisions.First();
+
+                KeyboardModel = GetKeyBoardDescription(_keyboardGeometry, revision.Model);
+                UpdateLayoutButtons(revision);
+                LayoutStatus = !_layoutIsCompiled ? "Not compiled" : "Compiled";
+
+                Layers = new ObservableCollection<string>(revision.Layers.Select(l => l.ToString()));
+            }
+        }
+
+        private string GetKeyBoardDescription(string keyboardGeometry, string revisionModel)
+        {
+            string keyboardDescription;
+
+            switch (keyboardGeometry)
+            {
+                case "ergodox-ez":
+                    keyboardDescription = "ErgoDox EZ ";
+
+                    break;
+                case "planck-ez":
+                    keyboardDescription = "Planck EZ ";
+
+                    break;
+                default:
+                    keyboardDescription = $"{keyboardGeometry} ";
+
+                    break;
+            }
+
+            keyboardDescription += char.ToUpper(revisionModel[0]) + revisionModel.Substring(1);
+
+            return keyboardDescription;
+        }
+
+        private void UpdateLayoutButtons(Revision revision)
+        {
+            Logger.TraceMethod();
+
+            _layoutIsCompiled = Uri.IsWellFormedUriString(revision.HexUrl, UriKind.Absolute) && Uri.IsWellFormedUriString(revision.SourcesUrl, UriKind.Absolute);
+
+            ((RelayCommand) DownloadHexFileCommand).RaiseCanExecuteChanged();
+            ((RelayCommand) DownloadSourcesCommand).RaiseCanExecuteChanged();
+
+            _hexFileUri = revision.HexUrl;
+            _sourcesZipUri = revision.SourcesUrl;
+        }
+
+        private async Task UpdateLayout()
+        {
+            Logger.TraceMethod();
+
+            var layoutHashId = ExtractLayoutHashId(LayoutUrlContent);
 
             try
             {
@@ -294,7 +519,7 @@ private string ExtractLayoutHashId(string layoutUrl)
             Logger.TraceMethod();
 
             var layoutHashIdGroupName = "layoutHashId";
-            var pattern = $"https://configure.ergodox-ez.com/ergodox-ez/layouts/(?<{layoutHashIdGroupName}>default|[a-zA-Z0-9]{{4,}})(?:/latest/[0-9])?";
+            var pattern = $"https://configure.ergodox-ez.com/(?:ergodox|planck)-ez/layouts/(?<{layoutHashIdGroupName}>default|[a-zA-Z0-9]{{4,}})(?:/latest/[0-9])?";
             var layoutHashId = "default";
 
             var regex = new Regex(pattern);
@@ -304,7 +529,7 @@ private string ExtractLayoutHashId(string layoutUrl)
             {
                 layoutHashId = match.Groups[layoutHashIdGroupName].Value;
             }
-            
+
             Logger.Debug("Layout URL = {0}", layoutUrl);
             Logger.Debug("Layout Hash ID = {0}", layoutHashId);
 
diff --git a/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/SettingsViewModelTest.cs b/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/SettingsViewModelTest.cs
index 8e005cef..33c0a8b4 100644
--- a/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/SettingsViewModelTest.cs
+++ b/src/InvvardDev.EZLayoutDisplay.Tests/ViewModel/SettingsViewModelTest.cs
@@ -1,5 +1,8 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
+using Castle.Components.DictionaryAdapter;
 using InvvardDev.EZLayoutDisplay.Desktop.Model;
 using InvvardDev.EZLayoutDisplay.Desktop.Service.Interface;
 using InvvardDev.EZLayoutDisplay.Desktop.View;
@@ -16,27 +19,37 @@ public void SettingsViewModel_Constructor()
         {
             //Arrange
             var tbContentInitial = "This is a test";
-            var settingsService = new Mock<ISettingsService>();
-            settingsService.Setup(s => s.ErgodoxLayoutUrl).Returns(tbContentInitial);
-            var windowService = new Mock<IWindowService>();
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.Setup(s => s.ErgodoxLayoutUrl).Returns(tbContentInitial);
+            var mockWindowService = new Mock<IWindowService>();
             var mockLayoutService = new Mock<ILayoutService>();
+            mockLayoutService.Setup(s => s.GetLayoutInfo(It.IsAny<string>())).Returns(Task.FromResult(It.IsAny<ErgodoxLayout>()));
+            var mockProcessService = new Mock<IProcessService>();
 
             //Act
-            var settingsViewModel = new SettingsViewModel(settingsService.Object, windowService.Object, mockLayoutService.Object);
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object);
 
             //Assert
             Assert.Equal("Settings", settingsViewModel.WindowTitle);
             Assert.Equal("Configurator URL to your layout :", settingsViewModel.LayoutUrlLabel);
+            Assert.Equal("Layout information", settingsViewModel.LayoutInfoGroupName);
+            Assert.Equal("Title :", settingsViewModel.LayoutTitleLabel);
+            Assert.Equal("Keyboard model :", settingsViewModel.KeyboardModelLabel);
+            Assert.Equal("Tags :", settingsViewModel.TagsLabel);
+            Assert.Equal("Layout status :", settingsViewModel.StatusLabel);
+            Assert.Equal("Layers :", settingsViewModel.LayersLabel);
+            Assert.Equal("HEX File", settingsViewModel.HexFileCommandLabel);
+            Assert.Equal("Sources zip", settingsViewModel.SourcesZipCommandLabel);
             Assert.Equal("Apply", settingsViewModel.ApplyCommandLabel);
+            Assert.Equal("Update", settingsViewModel.UpdateCommandLabel);
             Assert.Equal("Close", settingsViewModel.CloseCommandLabel);
             Assert.Equal("Cancel", settingsViewModel.CancelCommandLabel);
-            Assert.Equal(tbContentInitial, settingsViewModel.LayoutUrlContent);
             Assert.Equal("Hotkey to display layout", settingsViewModel.HotkeyTitleLabel);
             Assert.Equal("ALT", settingsViewModel.AltModifierLabel);
             Assert.Equal("CTRL", settingsViewModel.CtrlModifierLabel);
             Assert.Equal("SHIFT", settingsViewModel.ShiftModifierLabel);
             Assert.Equal("Windows", settingsViewModel.WindowsModifierLabel);
-            Assert.Equal("Update", settingsViewModel.UpdateCommandLabel);
+            Assert.Equal(tbContentInitial, settingsViewModel.LayoutUrlContent);
         }
 
         [ Theory ]
@@ -45,15 +58,16 @@ [ InlineData("initial value", "new value", true) ]
         public void RelayCommand_CanExecute(string initialValue, string newValue, bool canExecute)
         {
             //Arrange
-            var settingsService = new Mock<ISettingsService>();
-            settingsService.Setup(s => s.ErgodoxLayoutUrl).Returns(initialValue);
-            var windowService = new Mock<IWindowService>();
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.Setup(s => s.ErgodoxLayoutUrl).Returns(initialValue);
+            var mockWindowService = new Mock<IWindowService>();
             var mockLayoutService = new Mock<ILayoutService>();
+            var mockProcessService = new Mock<IProcessService>();
 
             //Act
-            var settingsViewModel = new SettingsViewModel(settingsService.Object, windowService.Object, mockLayoutService.Object) {
-                                                                                                                                      LayoutUrlContent = newValue
-                                                                                                                                  };
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object) {
+                                                                                                                                                                         LayoutUrlContent = newValue
+                                                                                                                                                                     };
 
             //Assert
             if (canExecute)
@@ -76,21 +90,23 @@ public void ApplyCommand_Execute()
             //Arrange
             var tbContentInitial = "This is a test";
             var tbContentNewValue = "new value";
-            var settingsService = new Mock<ISettingsService>();
-            settingsService.Setup(s => s.Save()).Verifiable();
-            settingsService.SetupProperty(s => s.ErgodoxLayoutUrl, tbContentInitial);
-            var windowService = new Mock<IWindowService>();
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.Setup(s => s.Save()).Verifiable();
+            mockSettingsService.SetupProperty(s => s.ErgodoxLayoutUrl, tbContentInitial);
+            var mockWindowService = new Mock<IWindowService>();
             var mockLayoutService = new Mock<ILayoutService>();
+            var mockProcessService = new Mock<IProcessService>();
 
             //Act
-            var settingsViewModel = new SettingsViewModel(settingsService.Object, windowService.Object, mockLayoutService.Object) {
-                                                                                                                                      LayoutUrlContent = tbContentNewValue
-                                                                                                                                  };
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object) {
+                                                                                                                                                                         LayoutUrlContent =
+                                                                                                                                                                             tbContentNewValue
+                                                                                                                                                                     };
             settingsViewModel.ApplySettingsCommand.Execute(null);
 
             //Assert
-            Assert.Equal(tbContentNewValue, settingsService.Object.ErgodoxLayoutUrl);
-            settingsService.Verify(s => s.Save());
+            Assert.Equal(tbContentNewValue, mockSettingsService.Object.ErgodoxLayoutUrl);
+            mockSettingsService.Verify(s => s.Save());
             Assert.False(settingsViewModel.ApplySettingsCommand.CanExecute(null));
             Assert.False(settingsViewModel.CancelSettingsCommand.CanExecute(null));
         }
@@ -101,21 +117,23 @@ public void CancelCommand_Execute()
             //Arrange
             var tbContentInitial = "This is a test";
             var tbContentNewValue = "new value";
-            var settingsService = new Mock<ISettingsService>();
-            settingsService.Setup(s => s.Cancel()).Verifiable();
-            settingsService.SetupProperty(s => s.ErgodoxLayoutUrl, tbContentInitial);
-            var windowService = new Mock<IWindowService>();
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.Setup(s => s.Cancel()).Verifiable();
+            mockSettingsService.SetupProperty(s => s.ErgodoxLayoutUrl, tbContentInitial);
+            var mockWindowService = new Mock<IWindowService>();
             var mockLayoutService = new Mock<ILayoutService>();
+            var mockProcessService = new Mock<IProcessService>();
 
             //Act
-            var settingsViewModel = new SettingsViewModel(settingsService.Object, windowService.Object, mockLayoutService.Object) {
-                                                                                                                                      LayoutUrlContent = tbContentNewValue
-                                                                                                                                  };
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object) {
+                                                                                                                                                                         LayoutUrlContent =
+                                                                                                                                                                             tbContentNewValue
+                                                                                                                                                                     };
             settingsViewModel.CancelSettingsCommand.Execute(null);
 
             //Assert
-            Assert.Equal(tbContentInitial, settingsService.Object.ErgodoxLayoutUrl);
-            settingsService.Verify(s => s.Cancel());
+            Assert.Equal(tbContentInitial, mockSettingsService.Object.ErgodoxLayoutUrl);
+            mockSettingsService.Verify(s => s.Cancel());
             Assert.False(settingsViewModel.ApplySettingsCommand.CanExecute(null));
             Assert.False(settingsViewModel.CancelSettingsCommand.CanExecute(null));
         }
@@ -128,15 +146,16 @@ public void CloseCommand_Execute(bool mustSave)
             //Arrange
             var tbContentInitial = "This is a test";
             var tbContentNewValue = "new value";
-            var settingsService = new Mock<ISettingsService>();
-            settingsService.Setup(s => s.Save()).Verifiable();
-            settingsService.SetupProperty(s => s.ErgodoxLayoutUrl, tbContentInitial);
-            var windowService = new Mock<IWindowService>();
-            windowService.Setup(w => w.CloseWindow<SettingsWindow>()).Verifiable();
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.Setup(s => s.Save()).Verifiable();
+            mockSettingsService.SetupProperty(s => s.ErgodoxLayoutUrl, tbContentInitial);
+            var mockWindowService = new Mock<IWindowService>();
+            mockWindowService.Setup(w => w.CloseWindow<SettingsWindow>()).Verifiable();
             var mockLayoutService = new Mock<ILayoutService>();
+            var mockProcessService = new Mock<IProcessService>();
 
             //Act
-            var settingsViewModel = new SettingsViewModel(settingsService.Object, windowService.Object, mockLayoutService.Object);
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object);
 
             if (mustSave)
             {
@@ -148,19 +167,19 @@ public void CloseCommand_Execute(bool mustSave)
             //Assert
             if (mustSave)
             {
-                Assert.Equal(tbContentNewValue, settingsService.Object.ErgodoxLayoutUrl);
-                settingsService.Verify(s => s.Save(), Times.Once);
+                Assert.Equal(tbContentNewValue, mockSettingsService.Object.ErgodoxLayoutUrl);
+                mockSettingsService.Verify(s => s.Save(), Times.Once);
                 Assert.False(settingsViewModel.ApplySettingsCommand.CanExecute(null));
                 Assert.False(settingsViewModel.CancelSettingsCommand.CanExecute(null));
-                windowService.Verify(w => w.CloseWindow<SettingsWindow>(), Times.Once);
+                mockWindowService.Verify(w => w.CloseWindow<SettingsWindow>(), Times.Once);
             }
             else
             {
-                Assert.Equal(tbContentInitial, settingsService.Object.ErgodoxLayoutUrl);
+                Assert.Equal(tbContentInitial, mockSettingsService.Object.ErgodoxLayoutUrl);
                 Assert.False(settingsViewModel.ApplySettingsCommand.CanExecute(null));
                 Assert.False(settingsViewModel.CancelSettingsCommand.CanExecute(null));
-                settingsService.Verify(s => s.Save(), Times.Never);
-                windowService.Verify(w => w.CloseWindow<SettingsWindow>(), Times.Once);
+                mockSettingsService.Verify(s => s.Save(), Times.Never);
+                mockWindowService.Verify(w => w.CloseWindow<SettingsWindow>(), Times.Once);
             }
         }
 
@@ -186,9 +205,10 @@ public void UpdateLayoutCommand_Execute(string layoutUrl, string expectedHashId)
             var mockLayoutService = new Mock<ILayoutService>();
             mockLayoutService.Setup(l => l.GetErgodoxLayout(expectedHashId)).Returns(Task.FromResult(It.IsAny<ErgodoxLayout>())).Verifiable();
             mockLayoutService.Setup(l => l.PrepareEZLayout(It.IsAny<ErgodoxLayout>())).Verifiable();
+            var mockProcessService = new Mock<IProcessService>();
 
             //Act
-            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object);
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object);
 
             settingsViewModel.UpdateLayoutCommand.Execute(null);
 
@@ -206,9 +226,10 @@ public void UpdateLayoutCommandExecute_ArgumentExceptionRaised()
             mockWindowService.Setup(w => w.ShowWarning(It.IsAny<string>())).Verifiable();
             var mockLayoutService = new Mock<ILayoutService>();
             mockLayoutService.Setup(l => l.GetErgodoxLayout(It.IsAny<string>())).Throws<ArgumentException>();
+            var processService = new Mock<IProcessService>();
 
             // Act
-            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object);
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, processService.Object);
             settingsViewModel.UpdateLayoutCommand.Execute(null);
 
             // Assert
@@ -226,14 +247,302 @@ public void UpdateLayoutCommandExecute_ArgumentNullExceptionRaised()
             mockWindowService.Setup(w => w.ShowWarning(It.IsAny<string>())).Verifiable();
             var mockLayoutService = new Mock<ILayoutService>();
             mockLayoutService.Setup(l => l.GetErgodoxLayout(It.IsAny<string>())).Throws<ArgumentNullException>();
+            var processService = new Mock<IProcessService>();
 
             // Act
-            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object);
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, processService.Object);
             settingsViewModel.UpdateLayoutCommand.Execute(null);
 
             // Assert
             mockLayoutService.Verify();
             mockWindowService.Verify();
         }
+
+        [ Theory ]
+        [ InlineData(null, null, 0) ]
+        [ InlineData("", null, 0) ]
+        [ InlineData("  ", null, 0) ]
+        [ InlineData(null, "", 0) ]
+        [ InlineData(null, "  ", 0) ]
+        [ InlineData("tag", "geometry", 1) ]
+        public void OpenTagSearchCommandExecute(string tag, string keyboardGeometry, int callNumber)
+        {
+            // Arrange
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.SetupProperty(s => s.ErgodoxLayoutUrl, "");
+            var mockWindowService = new Mock<IWindowService>();
+            var mockLayoutService = new Mock<ILayoutService>();
+            mockLayoutService.Setup(l => l.GetLayoutInfo(It.IsAny<string>()))
+                             .Returns(Task.FromResult(new ErgodoxLayout() {
+                                                                              Geometry = keyboardGeometry
+                                                                          }));
+            var mockProcessService = new Mock<IProcessService>();
+            mockProcessService.Setup(p => p.StartWebUrl(It.IsAny<string>())).Verifiable();
+
+            // Act
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object);
+            settingsViewModel.OpenTagSearchCommand.Execute(tag);
+
+            // Assert
+            mockProcessService.Verify(p => p.StartWebUrl($"https://configure.ergodox-ez.com/{keyboardGeometry}/search?q={tag}"), Times.Exactly(callNumber));
+        }
+
+        [ Fact ]
+        public void OpenTagSearchCommandExecute_ArgumentNullException()
+        {
+            // Arrange
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.SetupProperty(s => s.ErgodoxLayoutUrl, "");
+            var mockWindowService = new Mock<IWindowService>();
+            mockWindowService.Setup(w => w.ShowWarning("Value cannot be null.")).Verifiable();
+            var mockLayoutService = new Mock<ILayoutService>();
+            mockLayoutService.Setup(l => l.GetLayoutInfo(It.IsAny<string>())).Throws<ArgumentNullException>().Verifiable();
+            var mockProcessService = new Mock<IProcessService>();
+
+            // Act
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object);
+
+            // Assert
+            mockLayoutService.Verify();
+            mockWindowService.Verify();
+        }
+
+        [ Fact ]
+        public void OpenTagSearchCommandExecute_ArgumentException()
+        {
+            // Arrange
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.SetupProperty(s => s.ErgodoxLayoutUrl, "");
+            var mockWindowService = new Mock<IWindowService>();
+            mockWindowService.Setup(w => w.ShowWarning("Value does not fall within the expected range.")).Verifiable();
+            var mockLayoutService = new Mock<ILayoutService>();
+            mockLayoutService.Setup(l => l.GetLayoutInfo(It.IsAny<string>())).Throws<ArgumentException>().Verifiable();
+            var mockProcessService = new Mock<IProcessService>();
+
+            // Act
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object);
+
+            // Assert
+            mockLayoutService.Verify();
+            mockWindowService.Verify();
+        }
+
+        [ Fact ]
+        public void UpdateErgoDoxInfo_LayoutInfoNull()
+        {
+            // Arrange
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.SetupProperty(s => s.ErgodoxLayoutUrl, "");
+            var mockWindowService = new Mock<IWindowService>();
+            var mockLayoutService = new Mock<ILayoutService>();
+            mockLayoutService.Setup(l => l.GetLayoutInfo(It.IsAny<string>())).Returns(Task.FromResult<ErgodoxLayout>(null));
+            var mockProcessService = new Mock<IProcessService>();
+
+            // Act
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object);
+
+            // Assert
+            Assert.Empty(settingsViewModel.Layers);
+            Assert.Empty(settingsViewModel.Tags);
+            Assert.Equal("", settingsViewModel.LayoutTitle);
+            Assert.Equal("", settingsViewModel.KeyboardModel);
+            Assert.Equal("", settingsViewModel.LayoutStatus);
+            Assert.False(settingsViewModel.DownloadHexFileCommand.CanExecute(null));
+            Assert.False(settingsViewModel.DownloadSourcesCommand.CanExecute(null));
+        }
+
+        [ Theory ]
+        [ InlineData("ergodox-ez", "ErgoDox EZ Model") ]
+        [ InlineData("planck-ez", "Planck EZ Model") ]
+        [ InlineData("other", "other Model") ]
+        public void UpdateErgoDoxInfo_LayoutInfoNotNull(string geometry, string expectedKeyboardModel)
+        {
+            // Arrange
+            var expectedLayoutStatus = "Not compiled";
+            var expectedInfo = new ErgodoxLayout() {
+                                                       Geometry = geometry,
+                                                       Title = "ezlayout",
+                                                       HashId = "asdf",
+                                                       Tags = new List<ErgodoxTag> {
+                                                                                       new ErgodoxTag {
+                                                                                                          Name = "Tag 1"
+                                                                                                      }
+                                                                                   },
+                                                       Revisions = new List<Revision> {
+                                                                                          new Revision {
+                                                                                                           HexUrl = "",
+                                                                                                           SourcesUrl = "",
+                                                                                                           Model = "Model",
+                                                                                                           Layers = new List<ErgodoxLayer> {
+                                                                                                                                               new ErgodoxLayer() {
+                                                                                                                                                                      Title = "Layer",
+                                                                                                                                                                      Position = 1
+                                                                                                                                                                  }
+                                                                                                                                           }
+                                                                                                       }
+                                                                                      }
+                                                   };
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.SetupProperty(s => s.ErgodoxLayoutUrl, "");
+            var mockWindowService = new Mock<IWindowService>();
+            var mockLayoutService = new Mock<ILayoutService>();
+            mockLayoutService.Setup(l => l.GetLayoutInfo(It.IsAny<string>())).Returns(Task.FromResult(expectedInfo));
+            var mockProcessService = new Mock<IProcessService>();
+
+            // Act
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object);
+
+            // Assert
+            Assert.Single(settingsViewModel.Layers);
+            Assert.Equal(expectedInfo.Revisions[0].Layers[0].ToString(), settingsViewModel.Layers[0]);
+            Assert.Single(settingsViewModel.Tags);
+            Assert.Equal(expectedInfo.Tags[0].Name, settingsViewModel.Tags[0]);
+
+            Assert.Equal(expectedInfo.Title, settingsViewModel.LayoutTitle);
+            Assert.Equal(expectedKeyboardModel, settingsViewModel.KeyboardModel);
+            Assert.Equal(expectedLayoutStatus, settingsViewModel.LayoutStatus);
+            Assert.False(settingsViewModel.DownloadHexFileCommand.CanExecute(null));
+            Assert.False(settingsViewModel.DownloadSourcesCommand.CanExecute(null));
+        }
+
+        [ Theory ]
+        [ InlineData("https://url.com/hex-file", "", "Not compiled", false) ]
+        [ InlineData("", "https://url.com/source-file", "Not compiled", false) ]
+        [ InlineData("https://url.com/hex-file", "https://url.com/source-file", "Compiled", true) ]
+        public void UpdateErgoDoxInfo_DownloadUrls(string hexUrl, string sourcesUrl, string expectedLayoutStatus, bool expectedButtonStatus)
+        {
+            // Arrange
+            var expectedInfo = new ErgodoxLayout() {
+                                                       Geometry = "",
+                                                       Title = "ezlayout",
+                                                       HashId = "asdf",
+                                                       Tags = new List<ErgodoxTag> {
+                                                                                       new ErgodoxTag {
+                                                                                                          Name = "Tag 1"
+                                                                                                      }
+                                                                                   },
+                                                       Revisions = new List<Revision> {
+                                                                                          new Revision {
+                                                                                                           HexUrl = hexUrl,
+                                                                                                           SourcesUrl = sourcesUrl,
+                                                                                                           Model = "Model",
+                                                                                                           Layers = new List<ErgodoxLayer> {
+                                                                                                                                               new ErgodoxLayer() {
+                                                                                                                                                                      Title = "Layer",
+                                                                                                                                                                      Position = 1
+                                                                                                                                                                  }
+                                                                                                                                           }
+                                                                                                       }
+                                                                                      }
+                                                   };
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.SetupProperty(s => s.ErgodoxLayoutUrl, "");
+            var mockWindowService = new Mock<IWindowService>();
+            var mockLayoutService = new Mock<ILayoutService>();
+            mockLayoutService.Setup(l => l.GetLayoutInfo(It.IsAny<string>())).Returns(Task.FromResult(expectedInfo));
+            var mockProcessService = new Mock<IProcessService>();
+
+            // Act
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object);
+
+            // Assert
+            Assert.Equal(expectedLayoutStatus, settingsViewModel.LayoutStatus);
+            Assert.Equal(expectedButtonStatus, settingsViewModel.DownloadHexFileCommand.CanExecute(null));
+            Assert.Equal(expectedButtonStatus, settingsViewModel.DownloadSourcesCommand.CanExecute(null));
+        }
+
+        [Theory]
+        [InlineData("https://url.com/hex-file", "", 0)]
+        [InlineData("", "https://url.com/source-file", 0)]
+        [InlineData("https://url.com/hex-file", "https://url.com/source-file", 1)]
+        public void DownloadHexFileCommand_Execute(string hexUrl, string sourcesUrl, int expectedCommandExecute)
+        {
+            // Arrange
+            var expectedInfo = new ErgodoxLayout()
+            {
+                Geometry = "",
+                Title = "ezlayout",
+                HashId = "asdf",
+                Tags = new List<ErgodoxTag> {
+                                                                                       new ErgodoxTag {
+                                                                                                          Name = "Tag 1"
+                                                                                                      }
+                                                                                   },
+                Revisions = new List<Revision> {
+                                                                                          new Revision {
+                                                                                                           HexUrl = hexUrl,
+                                                                                                           SourcesUrl = sourcesUrl,
+                                                                                                           Model = "Model",
+                                                                                                           Layers = new List<ErgodoxLayer> {
+                                                                                                                                               new ErgodoxLayer() {
+                                                                                                                                                                      Title = "Layer",
+                                                                                                                                                                      Position = 1
+                                                                                                                                                                  }
+                                                                                                                                           }
+                                                                                                       }
+                                                                                      }
+            };
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.SetupProperty(s => s.ErgodoxLayoutUrl, "");
+            var mockWindowService = new Mock<IWindowService>();
+            var mockLayoutService = new Mock<ILayoutService>();
+            mockLayoutService.Setup(l => l.GetLayoutInfo(It.IsAny<string>())).Returns(Task.FromResult(expectedInfo));
+            var mockProcessService = new Mock<IProcessService>();
+            mockProcessService.Setup(p => p.StartWebUrl(hexUrl)).Verifiable();
+
+            // Act
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object);
+            settingsViewModel.DownloadHexFileCommand.Execute(null);
+
+            // Assert
+            mockProcessService.Verify(p => p.StartWebUrl(hexUrl), Times.Exactly(expectedCommandExecute));
+        }
+
+        [Theory]
+        [InlineData("https://url.com/hex-file", "", 0)]
+        [InlineData("", "https://url.com/source-file", 0)]
+        [InlineData("https://url.com/hex-file", "https://url.com/source-file", 1)]
+        public void DownloadSourcesCommand_Execute(string hexUrl, string sourcesUrl, int expectedCommandExecute)
+        {
+            // Arrange
+            var expectedInfo = new ErgodoxLayout()
+            {
+                Geometry = "",
+                Title = "ezlayout",
+                HashId = "asdf",
+                Tags = new List<ErgodoxTag> {
+                                                                                       new ErgodoxTag {
+                                                                                                          Name = "Tag 1"
+                                                                                                      }
+                                                                                   },
+                Revisions = new List<Revision> {
+                                                                                          new Revision {
+                                                                                                           HexUrl = hexUrl,
+                                                                                                           SourcesUrl = sourcesUrl,
+                                                                                                           Model = "Model",
+                                                                                                           Layers = new List<ErgodoxLayer> {
+                                                                                                                                               new ErgodoxLayer() {
+                                                                                                                                                                      Title = "Layer",
+                                                                                                                                                                      Position = 1
+                                                                                                                                                                  }
+                                                                                                                                           }
+                                                                                                       }
+                                                                                      }
+            };
+            var mockSettingsService = new Mock<ISettingsService>();
+            mockSettingsService.SetupProperty(s => s.ErgodoxLayoutUrl, "");
+            var mockWindowService = new Mock<IWindowService>();
+            var mockLayoutService = new Mock<ILayoutService>();
+            mockLayoutService.Setup(l => l.GetLayoutInfo(It.IsAny<string>())).Returns(Task.FromResult(expectedInfo));
+            var mockProcessService = new Mock<IProcessService>();
+            mockProcessService.Setup(p => p.StartWebUrl(hexUrl)).Verifiable();
+
+            // Act
+            var settingsViewModel = new SettingsViewModel(mockSettingsService.Object, mockWindowService.Object, mockLayoutService.Object, mockProcessService.Object);
+            settingsViewModel.DownloadSourcesCommand.Execute(null);
+
+            // Assert
+            mockProcessService.Verify(p => p.StartWebUrl(sourcesUrl), Times.Exactly(expectedCommandExecute));
+        }
     }
 }
\ No newline at end of file
diff --git a/src/InvvardDev.EZLayoutDisplay.sln.DotSettings b/src/InvvardDev.EZLayoutDisplay.sln.DotSettings
index 8d835aae..5d6ad40f 100644
--- a/src/InvvardDev.EZLayoutDisplay.sln.DotSettings
+++ b/src/InvvardDev.EZLayoutDisplay.sln.DotSettings
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.ViewModel.ViewModelLocator" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.View.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Model.Enum.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Design.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="XamlGeneratedNamespace.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Properties.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Model.Service.Implementation.ApplicationService" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Model.Service.Implementation.SettingsService" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Model.Service.Implementation.WindowService" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Model.Dictionary.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Model.Service.Implementation.KeyboardHookService" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Service.Implementation.ApplicationService" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Service.Implementation.SettingsService" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Service.Implementation.WindowService" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Service.Implementation.KeyboardHookService" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Service.Design.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.App" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.ViewModel.DisplayLayoutViewModel" FunctionMask="LoadDesignTimeModel" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Model.KeyCategoryDetail" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="*" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="False" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Console" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Service.Implementation.LayoutService" FunctionMask="GetLayoutTemplate" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Service.Implementation.LayoutService" FunctionMask="ReadLayoutDefinition" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Model.Hotkey" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Helper.KeyContentTemplateSelector" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.ViewModel.DisplayLayoutViewModel" FunctionMask="LoadCompleteLayout" IsEnabled="True" /&gt;&lt;Filter ModuleMask="InvvardDev.EZLayoutDisplay.Desktop" ModuleVersionMask="*" ClassMask="InvvardDev.EZLayoutDisplay.Desktop.Service.Implementation.ProcessService" FunctionMask="*" IsEnabled="True" /&gt;&lt;/ExcludeFilters&gt;&lt;/data&gt;</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hotkey/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Invvard/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file