Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

57 files changed, 2996 insertions, 1886 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/App.config b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/App.config
new file mode 100644
index 000000000..56898686f
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/App.config
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Contracts/IMainView.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Contracts/IMainView.cs
new file mode 100644
index 000000000..ea0744c84
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Contracts/IMainView.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.Dispensers.Contracts
+{
+    public enum DispensersNavigationView
+    {
+        DispensersView,
+        DispenserView,
+    }
+
+    public interface IMainView : IView
+    {
+        void NavigateTo(DispensersNavigationView view);
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/DispensersModule.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/DispensersModule.cs
new file mode 100644
index 000000000..6d6c7d8e6
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/DispensersModule.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media.Imaging;
+using Tango.BL.Enumerations;
+using Tango.MachineStudio.Dispensers.Views;
+using Tango.MachineStudio.Common;
+using Tango.SharedUI.Helpers;
+
+namespace Tango.MachineStudio.ColorLab
+{
+    [StudioModule(10)]
+    public class DispensersModule : StudioModuleBase
+    {
+        public override string Name
+        {
+            get
+            {
+                return "Dispensers";
+            }
+        }
+
+        public override string Description
+        {
+            get
+            {
+                return "Manage twine's dispensers repository.";
+            }
+        }
+
+        public override BitmapSource Image
+        {
+            get
+            {
+                return ResourceHelper.GetImageFromResources("Images/dispensers.png");
+            }
+        }
+
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(MainView);
+            }
+        }
+
+        public override Permissions Permission
+        {
+            get
+            {
+                return Permissions.RunResearchModule;
+            }
+        }
+
+        public override void Dispose()
+        {
+            
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Images/dispensers-title.png b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Images/dispensers-title.png
new file mode 100644
index 000000000..b5c594aa7
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Images/dispensers-title.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Images/dispensers.png b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Images/dispensers.png
new file mode 100644
index 000000000..20f812e00
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Images/dispensers.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Models/DispenserModel.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Models/DispenserModel.cs
new file mode 100644
index 000000000..94bf24e85
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Models/DispenserModel.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL;
+using Tango.BL.Entities;
+
+namespace Tango.MachineStudio.Dispensers.Models
+{
+    public class DispenserModel
+    {
+        private ObservablesContext _context;
+
+        public Dispenser Dispenser { get; set; }
+
+        public DispenserModel(Dispenser dispenser, ObservablesContext context)
+        {
+            Dispenser = dispenser;
+            _context = context;
+        }
+
+
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..f52524e12
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/AssemblyInfo.cs
@@ -0,0 +1,19 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+[assembly: AssemblyTitle("Tango - Machine Studio Dispensers Module")]
+[assembly: AssemblyVersion("2.0.12.1608")]
+
+[assembly: ComVisible(false)]
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Resources.Designer.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..436917dd5
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.MachineStudio.Dispensers.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.MachineStudio.Dispensers.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Resources.resx b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Settings.Designer.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..caf9445c0
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.MachineStudio.Dispensers.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Settings.settings b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Settings.settings
new file mode 100644
index 000000000..033d7a5e9
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Tango.MachineStudio.Dispensers.csproj b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Tango.MachineStudio.Dispensers.csproj
new file mode 100644
index 000000000..bd8f858a6
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Tango.MachineStudio.Dispensers.csproj
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{F69DA3A8-F823-461E-87CF-A9275ABC0B15}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <RootNamespace>Tango.MachineStudio.Dispensers</RootNamespace>
+    <AssemblyName>Tango.MachineStudio.Dispensers</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Contracts\IMainView.cs" />
+    <Compile Include="DispensersModule.cs" />
+    <Compile Include="Models\DispenserModel.cs" />
+    <Compile Include="ViewModelLocator.cs" />
+    <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="Views\DispensersView.xaml.cs">
+      <DependentUpon>DispensersView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DispenserView.xaml.cs">
+      <DependentUpon>DispenserView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MainView.xaml.cs">
+      <DependentUpon>MainView.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\SideChains\Tango.AutoComplete\Tango.AutoComplete.csproj">
+      <Project>{bb2abb74-ba58-4812-83aa-ec8171f42df4}</Project>
+      <Name>Tango.AutoComplete</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
+      <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
+      <Name>Tango.BL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Core\Tango.Core.csproj">
+      <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
+      <Name>Tango.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Logging\Tango.Logging.csproj">
+      <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
+      <Name>Tango.Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Settings\Tango.Settings.csproj">
+      <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
+      <Name>Tango.Settings</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.SharedUI\Tango.SharedUI.csproj">
+      <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project>
+      <Name>Tango.SharedUI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Tango.MachineStudio.Common\Tango.MachineStudio.Common.csproj">
+      <Project>{cb0b0aa2-bb24-4bca-a720-45e397684e12}</Project>
+      <Name>Tango.MachineStudio.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\dispensers-title.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\DispensersView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\DispenserView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\MainView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\dispensers.png" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModelLocator.cs
new file mode 100644
index 000000000..038a052b3
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModelLocator.cs
@@ -0,0 +1,28 @@
+using Tango.MachineStudio.Dispensers.ViewModels;
+using Tango.Core.DI;
+
+namespace Tango.MachineStudio.Dispensers
+{
+    /// <summary>
+    /// This class contains static references to all the view models in the
+    /// application and provides an entry point for the bindings.
+    /// </summary>
+    public static class ViewModelLocator
+    {
+        /// <summary>
+        /// Initializes a new instance of the ViewModelLocator class.
+        /// </summary>
+        static ViewModelLocator()
+        {
+            TangoIOC.Default.Register<MainViewVM>();
+        }
+
+        public static MainViewVM MainViewVM
+        {
+            get
+            {
+                return TangoIOC.Default.GetInstance<MainViewVM>();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs
new file mode 100644
index 000000000..d92d86580
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs
@@ -0,0 +1,197 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL;
+using Tango.BL.Entities;
+using Tango.MachineStudio.Common;
+using System.Data.Entity;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.Dispensers.Contracts;
+using Tango.Core.Commands;
+
+namespace Tango.MachineStudio.Dispensers.ViewModels
+{
+    public class MainViewVM : StudioViewModel<IMainView>
+    {
+        private ObservablesContext _dbContext;
+        private ObservablesContext _activeContext;
+        private INotificationProvider _notification;
+
+        private ObservableCollection<Dispenser> _dispensers;
+        public ObservableCollection<Dispenser> Dispensers
+        {
+            get { return _dispensers; }
+            set { _dispensers = value; RaisePropertyChangedAuto(); }
+        }
+
+        private Dispenser _selectedDispenser;
+        public Dispenser SelectedDispenser
+        {
+            get { return _selectedDispenser; }
+            set { _selectedDispenser = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        private Dispenser _activeDispenser;
+        public Dispenser ActiveDispenser
+        {
+            get { return _activeDispenser; }
+            set { _activeDispenser = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<DispenserType> _dispenserTypes;
+        public ObservableCollection<DispenserType> DispenserTypes
+        {
+            get { return _dispenserTypes; }
+            set { _dispenserTypes = value; RaisePropertyChangedAuto(); }
+        }
+
+        private String _filter;
+        public String Filter
+        {
+            get { return _filter; }
+            set { _filter = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
+        }
+
+        public RelayCommand AddDispenserCommand { get; set; }
+
+        public RelayCommand RemoveDispenserCommand { get; set; }
+
+        public RelayCommand ManageDispenserCommand { get; set; }
+
+        public RelayCommand BackToDispensersCommand { get; set; }
+
+        public RelayCommand SaveCommand { get; set; }
+
+        public MainViewVM(INotificationProvider notificationProvider)
+        {
+            _notification = notificationProvider;
+
+            ManageDispenserCommand = new RelayCommand(() => LoadSelectedDispenser(), () => SelectedDispenser != null);
+            BackToDispensersCommand = new RelayCommand(() => { View.NavigateTo(DispensersNavigationView.DispensersView); });
+            SaveCommand = new RelayCommand(SaveActiveDispenser);
+            AddDispenserCommand = new RelayCommand(AddNewDispenser);
+            RemoveDispenserCommand = new RelayCommand(RemoveSelectedDispenser, () => SelectedDispenser != null);
+        }
+
+        private async void OnFilterChanged()
+        {
+            if (Filter != null)
+            {
+                IsFree = false;
+                Dispensers = (await _dbContext.Dispensers.Where(x => x.SerialNumber.ToLower().StartsWith(Filter.ToLower())).Include(x => x.DispenserType).Include(x => x.IdsPacks).ToListAsync()).ToObservableCollection();
+                IsFree = true;
+            }
+        }
+
+        private async void LoadSelectedDispenser(bool isNew = false)
+        {
+            if (_activeContext != null)
+            {
+                _activeContext.Dispose();
+            }
+
+            using (_notification.PushTaskItem("Loading dispenser data..."))
+            {
+                try
+                {
+                    IsFree = false;
+                    _activeContext = ObservablesContext.CreateDefault();
+                    DispenserTypes = (await _activeContext.DispenserTypes.ToListAsync()).ToObservableCollection();
+
+                    if (!isNew)
+                    {
+                        ActiveDispenser = await _activeContext.Dispensers.Include(x => x.DispenserType).Include(x => x.IdsPacks).SingleOrDefaultAsync(x => x.Guid == SelectedDispenser.Guid);
+                        ActiveDispenser.InitMachine(_activeContext);
+                    }
+                    else
+                    {
+                        ActiveDispenser = new Dispenser();
+                        _activeContext.Dispensers.Add(ActiveDispenser);
+                    }
+                    View.NavigateTo(DispensersNavigationView.DispenserView);
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, $"Error loading dispenser {SelectedDispenser.SerialNumber}.");
+                    _notification.ShowError($"An error occurred while trying to load the selected dispenser data.\n{ex.Message}");
+                }
+                finally
+                {
+                    IsFree = true;
+                    InvalidateRelayCommands();
+                }
+            }
+        }
+
+
+        private void AddNewDispenser()
+        {
+            LoadSelectedDispenser(true);
+        }
+
+        private async void RemoveSelectedDispenser()
+        {
+            if (_notification.ShowQuestion("Are you sure you want to delete the selected dispenser?"))
+            {
+                try
+                {
+                    IsFree = false;
+
+                    if (SelectedDispenser.IsInstalled)
+                    {
+                        _notification.ShowError("Cannot delete an installed dispenser. Please detach it first from it's machine and try again.");
+                        return;
+                    }
+
+                    _dbContext.Dispensers.Remove(SelectedDispenser);
+                    await _dbContext.SaveChangesAsync();
+                    Dispensers.Remove(SelectedDispenser);
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, $"Error removing dispenser {SelectedDispenser.SerialNumber}.");
+                    _notification.ShowError($"An error occurred while trying to remove the selected dispenser.\n{ex.FlattenMessage()}");
+                }
+                finally
+                {
+                    IsFree = true;
+                }
+            }
+        }
+
+        private async void SaveActiveDispenser()
+        {
+            using (_notification.PushTaskItem("Saving dispenser data..."))
+            {
+                try
+                {
+                    IsFree = false;
+                    await _activeContext.SaveChangesAsync();
+                    if (SelectedDispenser != null)
+                    {
+                        await SelectedDispenser.Reload(_dbContext);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, $"Error saving dispenser {ActiveDispenser.SerialNumber}.");
+                    _notification.ShowError($"An error occurred while trying to save the dispenser data.\n{ex.Message}");
+                }
+                finally
+                {
+                    IsFree = true;
+                    InvalidateRelayCommands();
+                }
+            }
+        }
+
+        public async override void OnApplicationReady()
+        {
+            _dbContext = ObservablesContext.CreateDefault();
+            await _dbContext.DispenserTypes.LoadAsync();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml
new file mode 100644
index 000000000..d4b3b0655
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml
@@ -0,0 +1,66 @@
+<UserControl x:Class="Tango.MachineStudio.Dispensers.Views.DispenserView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.Dispensers.ViewModels"
+             xmlns:global="clr-namespace:Tango.MachineStudio.Dispensers"
+             xmlns:local="clr-namespace:Tango.MachineStudio.Dispensers.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <Grid Margin="20">
+        <DockPanel>
+            <Grid DockPanel.Dock="Top">
+                <StackPanel Orientation="Horizontal">
+                    <Button Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Command="{Binding BackToDispensersCommand}">
+                        <materialDesign:PackIcon Kind="ArrowLeft" Width="50" Height="50" Foreground="#202020" ToolTip="Back to RML list" />
+                    </Button>
+                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="34">
+                        <Run>DISPENSER</Run>
+                        <Run Text="{Binding ActiveDispenser.SerialNumber}"></Run>
+                    </TextBlock>
+                </StackPanel>
+
+                <Button HorizontalAlignment="Right" Width="170" Height="45" Margin="0 0 20 0" VerticalAlignment="Center" Command="{Binding SaveCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
+                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
+                    </StackPanel>
+                </Button>
+            </Grid>
+
+            <Grid DockPanel.Dock="Bottom">
+
+            </Grid>
+
+            <Grid Margin="0 20" IsEnabled="{Binding IsFree}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="139*"/>
+                    <ColumnDefinition Width="237*"/>
+                </Grid.ColumnDefinitions>
+
+                <Border Margin="100 140" CornerRadius="5" Background="#68F6F6F6" Padding="10" BorderBrush="Silver" BorderThickness="1">
+                    <controls:TableGrid RowHeight="50" Margin="10">
+                        <TextBlock FontWeight="SemiBold">Serial Number:</TextBlock>
+                        <TextBox Text="{Binding ActiveDispenser.SerialNumber}"></TextBox>
+
+                        <TextBlock FontWeight="SemiBold">Dispenser Type:</TextBlock>
+                        <ComboBox ItemsSource="{Binding DispenserTypes}" SelectedItem="{Binding ActiveDispenser.DispenserType}" DisplayMemberPath="Name"></ComboBox>
+
+                        <TextBlock FontWeight="SemiBold">Nanoliter / Pulse:</TextBlock>
+                        <mahapps:NumericUpDown HasDecimals="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="5" Value="{Binding ActiveDispenser.NlPerPulse}"></mahapps:NumericUpDown>
+
+                        <TextBlock FontWeight="SemiBold">Installed On Machine:</TextBlock>
+                        <TextBox IsEnabled="False" Text="{Binding ActiveDispenser.Machine.SerialNumber,Mode=OneWay,TargetNullValue='N/A',FallbackValue='N/A'}" IsReadOnly="True"></TextBox>
+                    </controls:TableGrid>
+                </Border>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml.cs
new file mode 100644
index 000000000..61e758dc7
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispenserView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.Dispensers.Views
+{
+    /// <summary>
+    /// Interaction logic for DispenserView.xaml
+    /// </summary>
+    public partial class DispenserView : UserControl
+    {
+        public DispenserView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
new file mode 100644
index 000000000..a7a57d801
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml
@@ -0,0 +1,76 @@
+<UserControl x:Class="Tango.MachineStudio.Dispensers.Views.DispensersView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.Dispensers.ViewModels"
+             xmlns:global="clr-namespace:Tango.MachineStudio.Dispensers"
+             xmlns:local="clr-namespace:Tango.MachineStudio.Dispensers.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <UserControl.Resources>
+        <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
+    </UserControl.Resources>
+
+    <Grid>
+        <DockPanel Margin="100" MaxWidth="1200">
+            <Grid DockPanel.Dock="Top">
+                <StackPanel Orientation="Horizontal">
+                    <Image  Source="../Images/dispensers-title.png" Width="350" RenderOptions.BitmapScalingMode="Fant" Margin="10" />
+
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0 0 0 10">
+                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="BarcodeScan" Width="32" Height="32" />
+                        <TextBox Width="400" FontSize="20" Margin="10 0 0 0" materialDesign:HintAssist.Hint="Serial Number" Text="{Binding Filter,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+            <Grid DockPanel.Dock="Bottom" IsEnabled="{Binding IsFree}">
+                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveDispenserCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
+                            <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
+                        </StackPanel>
+                    </Button>
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddDispenserCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
+                            <TextBlock Margin="5 0 0 0" FontSize="16">NEW DISPENSER</TextBlock>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Margin="50 0 0 0" MinWidth="200" Height="60" Command="{Binding ManageDispenserCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Pencil" Width="24" Height="24" />
+                            <TextBlock Margin="10 0 0 0" FontSize="18">EDIT</TextBlock>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+            </Grid>
+            <Grid IsEnabled="{Binding IsFree}">
+                <DataGrid Margin="0 0 0 10" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Dispensers}" SelectedItem="{Binding SelectedDispenser}">
+                    <DataGrid.CellStyle>
+                        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                            <Setter Property="BorderThickness" Value="0"/>
+                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                        </Style>
+                    </DataGrid.CellStyle>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Header="SERIAL NUMBER" Binding="{Binding SerialNumber}" Width="Auto" />
+                        <DataGridTextColumn Header="TYPE" Binding="{Binding DispenserType.Name}" Width="Auto" />
+                        <DataGridTextColumn Header="NANOLITER / PULSE" Binding="{Binding NlPerPulse}" Width="Auto" />
+                        <DataGridTextColumn Header="INSTALLED" Binding="{Binding IsInstalled}" Width="Auto" />
+                        <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml.cs
new file mode 100644
index 000000000..dda818ff6
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/DispensersView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.Dispensers.Views
+{
+    /// <summary>
+    /// Interaction logic for DispensersView.xaml
+    /// </summary>
+    public partial class DispensersView : UserControl
+    {
+        public DispensersView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/MainView.xaml
new file mode 100644
index 000000000..4062f8b74
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/MainView.xaml
@@ -0,0 +1,22 @@
+<UserControl x:Class="Tango.MachineStudio.Dispensers.Views.MainView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.Dispensers.ViewModels"
+             xmlns:global="clr-namespace:Tango.MachineStudio.Dispensers"
+             xmlns:local="clr-namespace:Tango.MachineStudio.Dispensers.Views"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+    <Grid>
+        <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide">
+            <local:DispensersView />
+            <local:DispenserView/>
+        </controls:NavigationControl>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/MainView.xaml.cs
new file mode 100644
index 000000000..bc3f747e8
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/Views/MainView.xaml.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.Core.DI;
+using Tango.MachineStudio.Dispensers.Contracts;
+
+namespace Tango.MachineStudio.Dispensers.Views
+{
+    /// <summary>
+    /// Interaction logic for MainView.xaml
+    /// </summary>
+    public partial class MainView : UserControl , IMainView
+    {
+        public MainView()
+        {
+            InitializeComponent();
+            TangoIOC.Default.Register<IMainView>(this);
+        }
+
+        public void NavigateTo(DispensersNavigationView view)
+        {
+            navigationControl.NavigateTo(view.ToString());
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/packages.config b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/packages.config
new file mode 100644
index 000000000..6676d3860
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/packages.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="CommonServiceLocator" version="1.3" targetFramework="net461" />
+  <package id="EntityFramework" version="6.0.0" targetFramework="net461" />
+  <package id="Expression.Blend.Sdk" version="1.0.2" targetFramework="net461" />
+  <package id="MahApps.Metro" version="1.5.0" targetFramework="net461" />
+  <package id="MaterialDesignColors" version="1.1.2" targetFramework="net461" />
+  <package id="MaterialDesignThemes" version="2.3.1.953" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs
index 18c8c3daa..d5022c761 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/ConfigurationsViewVM.cs
@@ -18,7 +18,6 @@ namespace Tango.MachineStudio.DB.ViewModels
         protected override void InitializeEntity(Configuration entity)
         {
             base.InitializeEntity(entity);
-            entity.CreationDate = DateTime.UtcNow;
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobToColumnDefinitionsConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobToColumnDefinitionsConverter.cs
index 0aadeca68..2ce5886c6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobToColumnDefinitionsConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/JobToColumnDefinitionsConverter.cs
@@ -21,7 +21,7 @@ namespace Tango.MachineStudio.Developer.Converters
 
             double totalLength = job.Segments.Sum(x => x.Length);
 
-            foreach (var segment in job.Segments)
+            foreach (var segment in job.OrderedSegments)
             {
                 columns.Add(new ColumnDefinition() { Width = new GridLength(segment.Length / totalLength, GridUnitType.Star) });
             }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index b75a84a6c..8b0a89336 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1482,7 +1482,14 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 LogManager.Log("Invalidating liquid factors, process parameters and process group history...");
 
-                _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().WithMediaProperties().Build();
+                if (_selectedRML != ActiveJob.Rml)
+                {
+                    _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().Build();
+                }
+                else
+                {
+                    _selectedRML = ActiveJob.Rml;
+                }
 
                 if (_selectedRML.Ccts.Count == 0)
                 {
@@ -1688,6 +1695,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
                         WindingMethods = _activeJobDbContext.WindingMethods.ToObservableCollection();
                         SpoolTypes = _activeJobDbContext.SpoolTypes.ToObservableCollection();
 
+                        LogManager.Log("Loading machine spools...");
+                        _activeJobDbContext.Spools.Where(x => x.MachineGuid == SelectedMachine.Guid).Load();
+
                         LogManager.Log("Setting active job...");
                         ActiveJob = new JobBuilder(_activeJobDbContext).Set(SelectedMachineJob.Guid).WithUser().WithSegments().WithBrushStops().WithConfiguration().WithRML().Build();
 
@@ -1708,7 +1718,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
 
                         LogManager.Log("Setting selected segment...");
-                        _selectedSegment = ActiveJob.Segments.FirstOrDefault();
+                        _selectedSegment = ActiveJob.OrderedSegments.FirstOrDefault();
 
                         ActiveJob.LengthChanged -= ActiveJob_LengthChanged;
                         ActiveJob.LengthChanged += ActiveJob_LengthChanged;
@@ -1838,6 +1848,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 {
                     await _machineDbContext.Jobs.Where(x => x.MachineGuid == SelectedMachine.Guid).Include(x => x.User).Include(x => x.User.Contact).LoadAsync();
 
+                    foreach (var job in SelectedMachine.Jobs)
+                    {
+                        await job.Reload(_machineDbContext);
+                    }
+
                     await _machineDbContext.ColorSpaces.LoadAsync();
 
                     await Task.Factory.StartNew(() =>
@@ -2153,10 +2168,14 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             LogManager.LogFormat("Duplicating {0} segments...", SelectedSegments.Count);
 
+            int start_index = SelectedSegments.Max(x => x.SegmentIndex);
+
+            ActiveJob.Segments.Where(x => x.SegmentIndex > start_index).ToList().ForEach(x => x.SegmentIndex = x.SegmentIndex + SelectedSegments.Count);
+
             foreach (var segment in SelectedSegments.OrderBy(x => x.SegmentIndex))
             {
                 var cloned = segment.Clone();
-                cloned.SegmentIndex = ActiveJob.Segments.Max(x => x.SegmentIndex) + 1;
+                cloned.SegmentIndex = start_index++;
                 ActiveJob.Segments.Add(cloned);
                 SelectedSegment = cloned;
             }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index b9c27e4f9..4fba0cc0b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -740,7 +740,11 @@
                                                                         <Image Source="../Images/ruler.png" Width="32"></Image>
                                                                         <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Segment Length</TextBlock>
                                                                     </StackPanel>
-                                                                    <mahapps:NumericUpDown x:Name="numSegmentLength" FontSize="{StaticResource NumbersFontSize}" HideUpDownButtons="True" Width="90" HorizontalAlignment="Left" FontFamily="{StaticResource digital-7}" StringFormat="{}{0:N1} m" Margin="0 2 0 0" Minimum="1" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding SelectedSegment.Length,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></mahapps:NumericUpDown>
+                                                                    <mahapps:NumericUpDown x:Name="numSegmentLength" FontSize="{StaticResource NumbersFontSize}" HideUpDownButtons="True" Width="90" HorizontalAlignment="Left" FontFamily="{StaticResource digital-7}" StringFormat="{}{0:N1} m" Margin="0 2 0 0" Minimum="1" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0 0 0 1" BorderBrush="DimGray" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding SelectedSegment.Length,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
+                                                                        <mahapps:NumericUpDown.Resources>
+                                                                            <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
+                                                                        </mahapps:NumericUpDown.Resources>
+                                                                    </mahapps:NumericUpDown>
                                                                 </StackPanel>
                                                             </Border>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index 8c58690fd..f3af53352 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -65,11 +65,11 @@ namespace Tango.MachineStudio.Developer.Views
             if (_vm != null && _vm.ActiveJob != null)
             {
                 List<Segment> segments = new List<Segment>();
-                foreach (var s in _vm.ActiveJob.Segments.OrderBy(x => x.SegmentIndex))
+                foreach (var s in _vm.ActiveJob.OrderedSegments)
                 {
                     segments.Add(s);
 
-                    if (_vm.ActiveJob.EnableInterSegment && _vm.ActiveJob.Segments.IndexOf(s) != _vm.ActiveJob.Segments.Count - 1)
+                    if (_vm.ActiveJob.EnableInterSegment && _vm.ActiveJob.OrderedSegments.IndexOf(s) != _vm.ActiveJob.OrderedSegments.Count - 1)
                     {
                         segments.Add(new Segment()
                         {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
index 1cb8536e0..ab97d7858 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
@@ -196,7 +196,7 @@
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
-                                        <DataGridTemplateColumn Header="USER" Width="100" CanUserSort="True" SortMemberPath="User">
+                                        <DataGridTemplateColumn Header="CREATED BY" Width="100" CanUserSort="True" SortMemberPath="User">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
                                                     <TextBlock Text="{Binding User.Contact.FirstName}" VerticalAlignment="Center" FontSize="14"></TextBlock>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
index 68cd65ad4..429450370 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml
@@ -131,168 +131,6 @@
                                                     <ItemsControl.ItemTemplate>
                                                         <DataTemplate>
                                                             <Grid ClipToBounds="False">
-                                                                <Grid.ToolTip>
-                                                                    <ToolTip Background="White" Padding="0" Visibility="{Binding IsInterSegment,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                                                        <Border BorderThickness="1" BorderBrush="#202020" CornerRadius="3" Padding="5">
-                                                                            <StackPanel Background="White">
-                                                                                <ItemsControl ItemsSource="{Binding BrushStops[0].LiquidVolumes}" VerticalAlignment="Center">
-                                                                                    <ItemsControl.ItemsPanel>
-                                                                                        <ItemsPanelTemplate>
-                                                                                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
-                                                                                        </ItemsPanelTemplate>
-                                                                                    </ItemsControl.ItemsPanel>
-                                                                                    <ItemsControl.ItemTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Width="60" Height="60" Margin="10 0 0 0">
-                                                                                                <ContentControl.Foreground>
-                                                                                                    <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                                                                                                </ContentControl.Foreground>
-                                                                                                <TextBlock Foreground="#202020" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding Volume,StringFormat=0.00}"></TextBlock>
-                                                                                            </ContentControl>
-                                                                                        </DataTemplate>
-                                                                                    </ItemsControl.ItemTemplate>
-                                                                                </ItemsControl>
-
-                                                                                <DataGrid Margin="0 10 0 0" SelectedIndex="-1" IsReadOnly="True" ItemsSource="{Binding BrushStops[0].LiquidVolumes}" AutoGenerateColumns="False" IsSynchronizedWithCurrentItem="True" CanUserAddRows="False" CanUserDeleteRows="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False" CanUserSortColumns="False" Background="Transparent" SelectionUnit="FullRow">
-                                                                                    <DataGrid.CellStyle>
-                                                                                        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
-                                                                                            <Setter Property="BorderThickness" Value="0"/>
-                                                                                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-                                                                                        </Style>
-                                                                                    </DataGrid.CellStyle>
-                                                                                    <DataGrid.Columns>
-                                                                                        <DataGridTemplateColumn Header="IDS PACK">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <Grid x:Name="t0">
-                                                                                                        <Polygon x:Name="t1" Points="0,0 15,0 0,15 0,0" Margin="-15 -11 0 0">
-                                                                                                            <Polygon.Fill>
-                                                                                                                <SolidColorBrush x:Name="t2" Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter},FallbackValue={StaticResource dummyColor}}" />
-                                                                                                            </Polygon.Fill>
-                                                                                                        </Polygon>
-                                                                                                        <TextBlock FontWeight="SemiBold" TextWrapping="Wrap" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}"></TextBlock>
-                                                                                                    </Grid>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="D/F">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding IdsPack.DispenserType.NlPerPulse,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="STEP">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <ComboBox ItemsSource="{Binding Source={StaticResource dispenserDivisions}}" SelectedItem="{Binding DispenserStepDivision,UpdateSourceTrigger=PropertyChanged}">
-                                                                                                        <ComboBox.ItemContainerStyle>
-                                                                                                            <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
-                                                                                                                <Setter Property="Background" Value="#ECECEC"></Setter>
-                                                                                                            </Style>
-                                                                                                        </ComboBox.ItemContainerStyle>
-                                                                                                        <ComboBox.ItemTemplate>
-                                                                                                            <DataTemplate>
-                                                                                                                <TextBlock Text="{Binding Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
-                                                                                                            </DataTemplate>
-                                                                                                        </ComboBox.ItemTemplate>
-                                                                                                    </ComboBox>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="MAX NL / CM">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding LiquidMaxNanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="VOLUME">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding Volume,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="%" Foreground="Gray"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="FORMULA">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding IdsPack.IdsPackFormula.Name}"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="NL / CM">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding NanoliterPerCentimeter,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="NL / SEC">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <TextBlock VerticalAlignment="Center">
-                                                                                                                        <Run Text="{Binding NanoliterPerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                        <Run Text="(nl)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                    </TextBlock>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                        <DataGridTemplateColumn Header="PULSE / SEC">
-                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                <DataTemplate>
-                                                                                                    <Label VerticalAlignment="Center">
-                                                                                                        <Label.Style>
-                                                                                                            <Style TargetType="Label">
-                                                                                                                <Setter Property="Content">
-                                                                                                                    <Setter.Value>
-                                                                                                                        <TextBlock>
-                                                                                                                                                 <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                                        </TextBlock>
-                                                                                                                    </Setter.Value>
-                                                                                                                </Setter>
-                                                                                                                <Style.Triggers>
-                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision}" Value="{x:Static dispensing:DispenserStepDivisions.Auto}">
-                                                                                                                        <Setter Property="Content" Value="Auto"></Setter>
-                                                                                                                    </DataTrigger>
-                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision,Converter={StaticResource IsNotConverter},ConverterParameter={x:Static dispensing:DispenserStepDivisions.Auto}}" Value="True">
-                                                                                                                        <Setter Property="Content">
-                                                                                                                            <Setter.Value>
-                                                                                                                                <TextBlock>
-                                                                                                                                                 <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
-                                                                                                                                </TextBlock>
-                                                                                                                            </Setter.Value>
-                                                                                                                        </Setter>
-                                                                                                                    </DataTrigger>
-                                                                                                                </Style.Triggers>
-                                                                                                            </Style>
-                                                                                                        </Label.Style>
-                                                                                                    </Label>
-                                                                                                </DataTemplate>
-                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                        </DataGridTemplateColumn>
-                                                                                    </DataGrid.Columns>
-                                                                                </DataGrid>
-                                                                            </StackPanel>
-                                                                        </Border>
-                                                                    </ToolTip>
-                                                                </Grid.ToolTip>
                                                                 <Grid.Width>
                                                                     <MultiBinding Converter="{StaticResource SegmentLengthToWidthConverter}">
                                                                         <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJobStatus.CurrentUnitTotalProgress"></Binding>
@@ -317,14 +155,7 @@
                                                                         </materialDesign:PackIcon>
                                                                     </StackPanel>
 
-                                                                    <Rectangle Height="30" Margin="0 10 0 0" VerticalAlignment="Center">
-                                                                        <Rectangle.Fill>
-                                                                            <MultiBinding Converter="{StaticResource SegmentToBrushConverterMulti}">
-                                                                                <Binding Path="."></Binding>
-                                                                                <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJob"></Binding>
-                                                                                <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.RunningJob.Length"></Binding>
-                                                                            </MultiBinding>
-                                                                        </Rectangle.Fill>
+                                                                    <Rectangle Height="30" Margin="0 10 0 0" VerticalAlignment="Center" Fill="{Binding SegmentBrush}">
                                                                     </Rectangle>
 
                                                                     <Canvas Height="30" HorizontalAlignment="Center" Width="80">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
index cff53ea8d..c9c7a4efc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
@@ -207,173 +207,166 @@
         </Grid>
 
         <Grid HorizontalAlignment="Right">
-            <Grid RenderTransformOrigin="1,0.5">
-                <Grid.Style>
-                    <Style TargetType="Grid">
-                        <Setter Property="LayoutTransform">
-                            <Setter.Value>
-                                <ScaleTransform ScaleY="1" ScaleX="0" />
-                            </Setter.Value>
-                        </Setter>
+            <ContentControl>
+                <ContentControl.Style>
+                    <Style TargetType="ContentControl">
+                        <Setter Property="Visibility" Value="Collapsed"></Setter>
+                        <Setter Property="Content" Value="{x:Null}"></Setter>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ElementName=toggleOutline,Path=IsChecked}" Value="True">
-                                <DataTrigger.EnterActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation To="1" Duration="00:00:0.2" Storyboard.TargetProperty="LayoutTransform.ScaleX" />
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </DataTrigger.EnterActions>
-                                <DataTrigger.ExitActions>
-                                    <BeginStoryboard>
-                                        <Storyboard>
-                                            <DoubleAnimation To="0" Duration="00:00:0.2" Storyboard.TargetProperty="LayoutTransform.ScaleX" />
-                                        </Storyboard>
-                                    </BeginStoryboard>
-                                </DataTrigger.ExitActions>
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </Grid.Style>
-                <Border BorderBrush="Gray" BorderThickness="1 0 0 0" Background="White">
-                    <Grid>
-                        <ScrollViewer Padding="20" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
-                            <StackPanel>
-                            <TextBlock Text="JOB OUTLINE" HorizontalAlignment="Center" Margin="0 10 0 0" FontSize="30"></TextBlock>
+                                <Setter Property="Visibility" Value="Visible"></Setter>
+                                <Setter Property="Content">
+                                    <Setter.Value>
+                                        <Border BorderBrush="Gray" BorderThickness="1 0 0 0" Background="White">
+                                            <Grid>
+                                                <ScrollViewer Padding="20" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" VirtualizingPanel.VirtualizationMode="Recycling" VirtualizingPanel.IsVirtualizing="True">
+                                                    <StackPanel>
+                                                        <TextBlock Text="JOB OUTLINE" HorizontalAlignment="Center" Margin="0 10 0 0" FontSize="30"></TextBlock>
 
-                            <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">BASIC</TextBlock>
-                                <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket,Converter={StaticResource ObjectToPropertiesConverter}}">
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
+                                                        <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">BASIC</TextBlock>
+                                                        <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket,Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
+                                                            <ItemsControl.ItemTemplate>
+                                                                <DataTemplate>
+                                                                    <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                                                        <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
+                                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
                                         <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
                                         <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                                </TextBlock>
-                                            </StackPanel>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
+                                                                        </TextBlock>
+                                                                    </StackPanel>
+                                                                </DataTemplate>
+                                                            </ItemsControl.ItemTemplate>
+                                                        </ItemsControl>
 
-                                <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">SPOOL</TextBlock>
-                                <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket.Spool,Converter={StaticResource ObjectToPropertiesConverter}}">
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
+                                                        <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">SPOOL</TextBlock>
+                                                        <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket.Spool,Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
+                                                            <ItemsControl.ItemTemplate>
+                                                                <DataTemplate>
+                                                                    <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                                                        <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
+                                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
                                         <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
                                         <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                                </TextBlock>
-                                            </StackPanel>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
+                                                                        </TextBlock>
+                                                                    </StackPanel>
+                                                                </DataTemplate>
+                                                            </ItemsControl.ItemTemplate>
+                                                        </ItemsControl>
 
-                                <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">PROCESS PARAMETERS</TextBlock>
-                            <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket.ProcessParameters,Converter={StaticResource ObjectToPropertiesConverter}}">
-                                <ItemsControl.ItemTemplate>
-                                    <DataTemplate>
-                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                            <materialDesign:PackIcon Kind="Settings" Width="12" Height="12" VerticalAlignment="Center" />
-                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
+                                                        <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">PROCESS PARAMETERS</TextBlock>
+                                                        <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket.ProcessParameters,Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
+                                                            <ItemsControl.ItemTemplate>
+                                                                <DataTemplate>
+                                                                    <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                                                        <materialDesign:PackIcon Kind="Settings" Width="12" Height="12" VerticalAlignment="Center" />
+                                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
                                         <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
                                         <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                            </TextBlock>
-                                        </StackPanel>
-                                    </DataTemplate>
-                                </ItemsControl.ItemTemplate>
-                            </ItemsControl>
+                                                                        </TextBlock>
+                                                                    </StackPanel>
+                                                                </DataTemplate>
+                                                            </ItemsControl.ItemTemplate>
+                                                        </ItemsControl>
 
-                                <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">SEGMENTS</TextBlock>
-                                <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket.Segments}" AlternationCount="10000">
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <StackPanel>
-                                                <TextBlock FontSize="14" FontWeight="SemiBold" Margin="0 10 0 0">
+                                                        <TextBlock FontSize="17" FontWeight="SemiBold" Margin="0 20 0 0">SEGMENTS</TextBlock>
+                                                        <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding JobHandler.JobTicket.Segments}" AlternationCount="10000" VirtualizingPanel.IsVirtualizing="True">
+                                                            <ItemsControl.ItemTemplate>
+                                                                <DataTemplate>
+                                                                    <Expander IsExpanded="False" Background="Transparent">
+                                                                        <Expander.Header>
+                                                                            <TextBlock FontSize="14" FontWeight="SemiBold">
                                                     <Run>#</Run><Run Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(ItemsControl.AlternationIndex),Mode=OneWay,Converter={StaticResource MathOperatorConverter},ConverterParameter='+1'}"></Run>
                                                     <Run Text="SEGMENT"></Run>
-                                                </TextBlock>
+                                                                            </TextBlock>
+                                                                        </Expander.Header>
+                                                                        <StackPanel>
 
-                                                <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding Converter={StaticResource ObjectToPropertiesConverter}}">
-                                                    <ItemsControl.ItemTemplate>
-                                                        <DataTemplate>
-                                                            <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                                <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
-                                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
+                                                                            <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
+                                                                                <ItemsControl.ItemTemplate>
+                                                                                    <DataTemplate>
+                                                                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                                                                            <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
+                                                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
                                         <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
                                         <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                                                </TextBlock>
-                                                            </StackPanel>
-                                                        </DataTemplate>
-                                                    </ItemsControl.ItemTemplate>
-                                                </ItemsControl>
+                                                                                            </TextBlock>
+                                                                                        </StackPanel>
+                                                                                    </DataTemplate>
+                                                                                </ItemsControl.ItemTemplate>
+                                                                            </ItemsControl>
 
-                                                <TextBlock FontSize="12" FontWeight="SemiBold" Margin="27 10 0 0">BRUSH STOPS</TextBlock>
-                                                <ItemsControl Margin="40 0 0 0" ItemsSource="{Binding BrushStops}" AlternationCount="10000">
-                                                    <ItemsControl.ItemTemplate>
-                                                        <DataTemplate>
-                                                            <StackPanel>
-                                                                <TextBlock FontSize="11" FontWeight="SemiBold" Margin="0 5 0 0">
+                                                                            <TextBlock FontSize="12" FontWeight="SemiBold" Margin="27 10 0 0">BRUSH STOPS</TextBlock>
+                                                                            <ItemsControl Margin="40 0 0 0" ItemsSource="{Binding BrushStops}" AlternationCount="10000" VirtualizingPanel.IsVirtualizing="True">
+                                                                                <ItemsControl.ItemTemplate>
+                                                                                    <DataTemplate>
+                                                                                        <StackPanel>
+                                                                                            <TextBlock FontSize="11" FontWeight="SemiBold" Margin="0 5 0 0">
                                                     <Run>#</Run><Run Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(ItemsControl.AlternationIndex),Mode=OneWay,Converter={StaticResource MathOperatorConverter},ConverterParameter='+1'}"></Run>
                                                     <Run Text="STOP"></Run>
-                                                                </TextBlock>
+                                                                                            </TextBlock>
 
-                                                                <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding Converter={StaticResource ObjectToPropertiesConverter}}">
-                                                                    <ItemsControl.ItemTemplate>
-                                                                        <DataTemplate>
-                                                                            <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                                                <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
-                                                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
+                                                                                            <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
+                                                                                                <ItemsControl.ItemTemplate>
+                                                                                                    <DataTemplate>
+                                                                                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                                                                                            <materialDesign:PackIcon Kind="Pencil" Width="12" Height="12" VerticalAlignment="Center" />
+                                                                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
                                         <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
                                         <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                                                                </TextBlock>
-                                                                            </StackPanel>
-                                                                        </DataTemplate>
-                                                                    </ItemsControl.ItemTemplate>
-                                                                </ItemsControl>
+                                                                                                            </TextBlock>
+                                                                                                        </StackPanel>
+                                                                                                    </DataTemplate>
+                                                                                                </ItemsControl.ItemTemplate>
+                                                                                            </ItemsControl>
 
-                                                                <TextBlock FontSize="12" FontWeight="SemiBold" Margin="27 10 0 0">DISPENSERS</TextBlock>
-                                                                <ItemsControl Margin="40 0 0 0" ItemsSource="{Binding Dispensers}" AlternationCount="10000">
-                                                                    <ItemsControl.ItemTemplate>
-                                                                        <DataTemplate>
-                                                                            <StackPanel>
-                                                                                <TextBlock FontSize="11" FontWeight="SemiBold" Margin="0 5 0 0">
+                                                                                            <TextBlock FontSize="12" FontWeight="SemiBold" Margin="27 10 0 0">DISPENSERS</TextBlock>
+                                                                                            <ItemsControl Margin="40 0 0 0" ItemsSource="{Binding Dispensers}" AlternationCount="10000" VirtualizingPanel.IsVirtualizing="True">
+                                                                                                <ItemsControl.ItemTemplate>
+                                                                                                    <DataTemplate>
+                                                                                                        <StackPanel>
+                                                                                                            <TextBlock FontSize="11" FontWeight="SemiBold" Margin="0 5 0 0">
                                                     <Run>#</Run><Run Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=(ItemsControl.AlternationIndex),Mode=OneWay,Converter={StaticResource MathOperatorConverter},ConverterParameter='+1'}"></Run>
                                                     <Run Text="DISPENSER"></Run>
-                                                                                </TextBlock>
+                                                                                                            </TextBlock>
 
-                                                                                <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding Converter={StaticResource ObjectToPropertiesConverter}}">
-                                                                                    <ItemsControl.ItemTemplate>
-                                                                                        <DataTemplate>
-                                                                                            <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                                                                <materialDesign:PackIcon Kind="ArrowRightBoldCircle" Width="12" Height="12" VerticalAlignment="Center" />
-                                                                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
+                                                                                                            <ItemsControl Margin="10 0 0 0" ItemsSource="{Binding Converter={StaticResource ObjectToPropertiesConverter}}" VirtualizingPanel.IsVirtualizing="True">
+                                                                                                                <ItemsControl.ItemTemplate>
+                                                                                                                    <DataTemplate>
+                                                                                                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                                                                                                            <materialDesign:PackIcon Kind="ArrowRightBoldCircle" Width="12" Height="12" VerticalAlignment="Center" />
+                                                                                                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">
                                         <Run Text="{Binding Name,Mode=OneWay}"></Run><Run>:</Run>
                                         <Run Text="{Binding Value,Mode=OneWay}" FontWeight="SemiBold"></Run>
-                                                                                                </TextBlock>
-                                                                                            </StackPanel>
-                                                                                        </DataTemplate>
-                                                                                    </ItemsControl.ItemTemplate>
-                                                                                </ItemsControl>
-                                                                            </StackPanel>
-                                                                        </DataTemplate>
-                                                                    </ItemsControl.ItemTemplate>
-                                                                </ItemsControl>
-                                                            </StackPanel>
-                                                        </DataTemplate>
-                                                    </ItemsControl.ItemTemplate>
-                                                </ItemsControl>
-                                            </StackPanel>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
-                            </StackPanel>
-                        </ScrollViewer>
-                    </Grid>
-                </Border>
-            </Grid>
+                                                                                                                            </TextBlock>
+                                                                                                                        </StackPanel>
+                                                                                                                    </DataTemplate>
+                                                                                                                </ItemsControl.ItemTemplate>
+                                                                                                            </ItemsControl>
+                                                                                                        </StackPanel>
+                                                                                                    </DataTemplate>
+                                                                                                </ItemsControl.ItemTemplate>
+                                                                                            </ItemsControl>
+                                                                                        </StackPanel>
+                                                                                    </DataTemplate>
+                                                                                </ItemsControl.ItemTemplate>
+                                                                            </ItemsControl>
+                                                                        </StackPanel>
+                                                                    </Expander>
+                                                                </DataTemplate>
+                                                            </ItemsControl.ItemTemplate>
+                                                        </ItemsControl>
+                                                    </StackPanel>
+                                                </ScrollViewer>
+                                            </Grid>
+                                        </Border>
+                                    </Setter.Value>
+                                </Setter>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </ContentControl.Style>
+
+            </ContentControl>
 
             <Border VerticalAlignment="Center" HorizontalAlignment="Left" Background="White" Width="30" Height="120" CornerRadius="10 0 0 10" Margin="-28 0 0 0" BorderBrush="Gray" BorderThickness="1 1 0 1">
                 <ToggleButton x:Name="toggleOutline" BorderThickness="0" Cursor="Hand" Background="Transparent">
@@ -385,7 +378,7 @@
                     <ToggleButton.Template>
                         <ControlTemplate TargetType="ToggleButton">
                             <Border Background="Transparent">
-                            <ContentPresenter></ContentPresenter>
+                                <ContentPresenter></ContentPresenter>
                             </Border>
 
                             <ControlTemplate.Triggers>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs
deleted file mode 100644
index d3b33c436..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ApplicationLogFileParser.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using Tango.Logging;
-
-namespace Tango.MachineStudio.Logging.Parsing
-{
-    public class ApplicationLogFileParser : ILogFileParser<LogItemBase>
-    {
-        public List<LogFile> GetLogFiles()
-        {
-            List<LogFile> logFiles = new List<LogFile>();
-
-            FileLogger logger = LogManager.Default.RegisteredLoggers.FirstOrDefault(x => x.GetType() == typeof(FileLogger)) as FileLogger;
-
-            String logFile = logger != null ? logger.LogFile : null;
-
-            foreach (var file in Directory.GetFiles(FileLogger.DefaultLogsFolder, "*.log").Where(x => Path.GetFileName(x).StartsWith("Tango.MachineStudio.UI") && x != logger.LogFile))
-            {
-                try
-                {
-                    String dateString = Path.GetFileNameWithoutExtension(file).Replace("Tango.MachineStudio.UI-", "");
-                    DateTime date = DateTime.ParseExact(dateString, "dd-MM-yyyy_HH-mm-ss", CultureInfo.InvariantCulture);
-                    logFiles.Add(new LogFile() { DateTime = date, File = file });
-                }
-                catch (Exception ex)
-                {
-                    LogManager.Default.Log(ex, $"Could not load application log file {Path.GetFileName(file)}");
-                }
-            }
-
-            return logFiles;
-        }
-
-        public List<LogItemBase> Parse(LogFile logFile)
-        {
-            List<LogItemBase> logItems = new List<LogItemBase>();
-
-            String text = File.ReadAllText(logFile.File);
-            var logs = Regex.Split(text, @"(\[\d{2}:\d{2}:\d{2}.\d{2}\])");
-
-            for (int i = 1; i < logs.Length; i += 2)
-            {
-                try
-                {
-                    DateTime date = DateTime.ParseExact(logs[i].Replace("[", "").Replace("]", ""), "HH:mm:ss.ff", CultureInfo.InvariantCulture);
-                    String rest = logs[i + 1];
-
-                    var entries = Regex.Split(rest, @"\[(.*?)\]");
-
-                    MessageLogItem item = new MessageLogItem();
-                    item.TimeStamp = new DateTime(logFile.DateTime.Year, logFile.DateTime.Month, logFile.DateTime.Day, date.Hour, date.Minute, date.Second, date.Millisecond);
-                    item.Category = (LogCategory)Enum.Parse(typeof(LogCategory), entries[1]);
-                    item.CallerFile = entries[3];
-                    item.CallerMethodName = entries[5];
-                    item.CallerLineNumber = int.Parse(entries[7]);
-                    item.Message = new String(entries[8].Skip(2).ToArray());
-
-                    logItems.Add(item);
-                }
-                catch (Exception ex)
-                {
-                    LogManager.Default.Log(ex, "Could not parse log line: " + logs[i]);
-                }
-            }
-
-            return logItems;
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
deleted file mode 100644
index 50c9d7532..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/EmbeddedLogFileParser.cs
+++ /dev/null
@@ -1,84 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using Tango.Integration.Operation;
-using Tango.Logging;
-using Tango.Settings;
-
-namespace Tango.MachineStudio.Logging.Parsing
-{
-    public class EmbeddedLogFileParser : ILogFileParser<EmbeddedLogItem>
-    {
-        public List<LogFile> GetLogFiles()
-        {
-            List<LogFile> logFiles = new List<LogFile>();
-
-            FileLogger logger = MachineOperator.EmbeddedLogManager.RegisteredLoggers.FirstOrDefault(x => x.GetType() == typeof(FileLogger)) as FileLogger;
-
-            String logFile = logger != null ? logger.LogFile : null;
-
-            if (Directory.Exists(MachineOperator.EmbeddedLogsFolder))
-            {
-                foreach (var file in Directory.GetFiles(MachineOperator.EmbeddedLogsFolder, "*.log").Where(x => x != logFile))
-                {
-                    try
-                    {
-                        String dateString = Path.GetFileNameWithoutExtension(file).Replace(MachineOperator.EmbeddedLogsTag + "-", "");
-                        DateTime date = DateTime.ParseExact(dateString, "dd-MM-yyyy_HH-mm-ss", CultureInfo.InvariantCulture);
-                        logFiles.Add(new LogFile() { DateTime = date, File = file });
-                    }
-                    catch (Exception ex)
-                    {
-                        LogManager.Default.Log(ex, $"Could not load embedded log file {Path.GetFileName(file)}");
-                    }
-                }
-            }
-
-            return logFiles;
-        }
-
-        public List<EmbeddedLogItem> Parse(LogFile logFile)
-        {
-            List<EmbeddedLogItem> logItems = new List<EmbeddedLogItem>();
-
-            String text = File.ReadAllText(logFile.File);
-            var logs = Regex.Split(text, @"(\[\d{2}:\d{2}:\d{2}.\d{2}\])");
-
-            for (int i = 1; i < logs.Length; i += 2)
-            {
-                try
-                {
-                    DateTime date = DateTime.ParseExact(logs[i].Replace("[", "").Replace("]", ""), "HH:mm:ss.ff", CultureInfo.InvariantCulture);
-                    String rest = logs[i + 1];
-
-                    var entries = Regex.Split(rest, @"\[(.*?)\]");
-
-                    EmbeddedLogItem item = new EmbeddedLogItem(new PMR.Debugging.StartDebugLogResponse()
-                    {
-                        Category = (PMR.Debugging.DebugLogCategory)Enum.Parse(typeof(PMR.Debugging.DebugLogCategory), entries[1]),
-                        FileName = entries[3],
-                        LineNumber = uint.Parse(entries[5]),
-                        ModuleId = uint.Parse(entries[7]),
-                        Filter = uint.Parse(entries[9]),
-                        Message = new String(entries[10].Skip(2).ToArray())
-                    });
-
-                    item.TimeStamp = new DateTime(logFile.DateTime.Year, logFile.DateTime.Month, logFile.DateTime.Day, date.Hour, date.Minute, date.Second, date.Millisecond);
-
-                    logItems.Add(item);
-                }
-                catch (Exception ex)
-                {
-                    LogManager.Default.Log(ex, "Could not parse log line: " + logs[i]);
-                }
-            }
-
-            return logItems;
-        }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ILogFileParser.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ILogFileParser.cs
deleted file mode 100644
index 05003c1a2..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/ILogFileParser.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.MachineStudio.Logging.Parsing
-{
-    public interface ILogFileParser<T>
-    {
-        List<T> Parse(LogFile logFile);
-
-        List<LogFile> GetLogFiles();
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/LogFile.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/LogFile.cs
deleted file mode 100644
index 4248bdbdc..000000000
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Parsing/LogFile.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.MachineStudio.Logging.Parsing
-{
-    public class LogFile
-    {
-        public DateTime DateTime { get; set; }
-
-        public String File { get; set; }
-    }
-}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj
index b81ba731d..b5108b75a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj
@@ -83,10 +83,6 @@
     <Compile Include="LoggingModule.cs" />
     <Compile Include="Navigation\LoggingNavigationManager.cs" />
     <Compile Include="Navigation\LoggingNavigationView.cs" />
-    <Compile Include="Parsing\ApplicationLogFileParser.cs" />
-    <Compile Include="Parsing\EmbeddedLogFileParser.cs" />
-    <Compile Include="Parsing\ILogFileParser.cs" />
-    <Compile Include="Parsing\LogFile.cs" />
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\EmbeddedLogsViewVM.cs" />
     <Compile Include="ViewModels\ApplicationLogsViewVM.cs" />
@@ -254,7 +250,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
index 3e0e3ab84..91cc677e0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/ApplicationLogsViewVM.cs
@@ -10,7 +10,6 @@ using Tango.Core.Commands;
 using Tango.Logging;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Logging.Navigation;
-using Tango.MachineStudio.Logging.Parsing;
 using Tango.MachineStudio.Logging.Views;
 using Tango.SharedUI;
 using Tango.SharedUI.Components;
@@ -105,7 +104,6 @@ namespace Tango.MachineStudio.Logging.ViewModels
             set { _maxDate = value; RaisePropertyChangedAuto(); }
         }
 
-
         private bool _isRealTime;
         public bool IsRealTime
         {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
index 3f6775b75..d8ecca4bb 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EmbeddedLogsViewVM.cs
@@ -5,12 +5,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
+using Tango.Integration.Logging;
 using Tango.Integration.Operation;
 using Tango.Logging;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
 using Tango.MachineStudio.Logging.Navigation;
-using Tango.MachineStudio.Logging.Parsing;
 using Tango.MachineStudio.Logging.Views;
 using Tango.SharedUI;
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Contracts/IMainView.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Contracts/IMainView.cs
new file mode 100644
index 000000000..392b557c4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Contracts/IMainView.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.MachineDesigner.Contracts
+{
+    public enum MachineDesignerNavigationView
+    {
+        MachinesView,
+        MachineDetailsView,
+        ConfigurationView,
+    }
+
+    public interface IMainView : IView
+    {
+        void NavigateTo(MachineDesignerNavigationView view);
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
index 3fa7c60cf..1cb95a076 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
@@ -76,19 +76,55 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="AutoComplete\MachineVersionsProvider.cs" />
+    <Compile Include="Contracts\IMainView.cs" />
     <Compile Include="ViewModelLocator.cs" />
+    <Compile Include="ViewModels\MachineCreationDialogVM.cs" />
     <Compile Include="ViewModels\MachineVersionDialogVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="Views\MachineCreationDialog.xaml.cs">
+      <DependentUpon>MachineCreationDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MachineDetailsView.xaml.cs">
+      <DependentUpon>MachineDetailsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MachineSettingsView.xaml.cs">
+      <DependentUpon>MachineSettingsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MachinesView.xaml.cs">
+      <DependentUpon>MachinesView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\MachineVersionDialog.xaml.cs">
       <DependentUpon>MachineVersionDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\MachineView.xaml.cs">
       <DependentUpon>MachineView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ConfigurationView.xaml.cs">
+      <DependentUpon>ConfigurationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="MachineDesignerModule.cs" />
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MachineDesignerModule.cs" />
+    <Compile Include="Views\SpoolsView.xaml.cs">
+      <DependentUpon>SpoolsView.xaml</DependentUpon>
+    </Compile>
+    <Page Include="Views\MachineCreationDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\MachineDetailsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\MachineSettingsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\MachinesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MachineVersionDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -97,10 +133,18 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\ConfigurationView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MainView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\SpoolsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
new file mode 100644
index 000000000..0f6ab3314
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineCreationDialogVM.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.MachineDesigner.ViewModels
+{
+    public class MachineCreationDialogVM : DialogViewVM
+    {
+        public List<MachineVersion> MachineVersions { get; set; }
+
+        public MachineVersion SelectedMachineVersion { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 5ae5c531c..71b2e0bd5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -18,45 +18,33 @@ using Tango.MachineStudio.Common;
 using Tango.BL;
 using Tango.AutoComplete.Editors;
 using System.Data.Entity;
+using Tango.BL.Builders;
+using Tango.MachineStudio.MachineDesigner.Contracts;
+using System.Windows.Threading;
+using Tango.Core.Threading;
 
 namespace Tango.MachineStudio.MachineDesigner.ViewModels
 {
-    public class MainViewVM : StudioViewModel
+    public class MainViewVM : StudioViewModel<IMainView>
     {
         private INotificationProvider _notification;
-        private ObservablesContext _db;
-        private Configuration _original_configuration;
+        private ActionTimer _machines_action_timer;
+        private ActionTimer _dispensers_action_timer;
 
         #region Properties
 
-        private ObservablesStaticCollections _adapter;
-        /// <summary>
-        /// Gets or sets the db static adapter.
-        /// </summary>
-        public ObservablesStaticCollections Adapter
+        private ObservablesStaticCollections _machinesAdapter;
+        public ObservablesStaticCollections MachinesAdapter
         {
-            get { return _adapter; }
-            set { _adapter = value; RaisePropertyChangedAuto(); }
+            get { return _machinesAdapter; }
+            set { _machinesAdapter = value; RaisePropertyChangedAuto(); }
         }
 
-        private bool _canWork;
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance can work.
-        /// </summary>
-        public bool CanWork
+        private ObservablesStaticCollections _activeMachineAdapter;
+        public ObservablesStaticCollections ActiveMachineAdapter
         {
-            get { return _canWork; }
-            set { _canWork = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
-        }
-
-        private Machine _machine;
-        /// <summary>
-        /// Gets or sets the current editable machine.
-        /// </summary>
-        public Machine Machine
-        {
-            get { return _machine; }
-            set { _machine = value; RaisePropertyChangedAuto(); }
+            get { return _activeMachineAdapter; }
+            set { _activeMachineAdapter = value; RaisePropertyChangedAuto(); }
         }
 
         private Machine _selectedMachine;
@@ -70,19 +58,21 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             {
                 if (_selectedMachine != value)
                 {
-                    _selectedMachine = value; RaisePropertyChangedAuto(); OnSelectedMachineChanged();
+                    _selectedMachine = value;
+                    RaisePropertyChangedAuto();
+                    InvalidateRelayCommands();
                 }
             }
         }
 
-        private Configuration _configuration;
+        private Machine _activeMachine;
         /// <summary>
-        /// Gets or sets the editable machine configuration.
+        /// Gets or sets the active machine.
         /// </summary>
-        public Configuration Configuration
+        public Machine ActiveMachine
         {
-            get { return _configuration; }
-            set { _configuration = value; RaisePropertyChangedAuto(); }
+            get { return _activeMachine; }
+            set { _activeMachine = value; RaisePropertyChangedAuto(); }
         }
 
         private IdsPack _selectedIds;
@@ -95,29 +85,19 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             set { _selectedIds = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
         }
 
-        private ObservableCollection<Configuration> _history;
+        private String _dispensersFilter;
         /// <summary>
-        /// Gets or sets the machine configuration history.
+        /// Gets or sets the dispensers filter.
         /// </summary>
-        public ObservableCollection<Configuration> History
+        public String DispensersFilter
         {
-            get { return _history; }
-            set { _history = value; RaisePropertyChangedAuto(); }
-        }
-
-        private Configuration _selectedHistoryConfiguration;
-        /// <summary>
-        /// Gets or sets the machine selected configuration from history.
-        /// </summary>
-        public Configuration SelectedHistoryConfiguration
-        {
-            get { return _selectedHistoryConfiguration; }
-            set { _selectedHistoryConfiguration = value; RaisePropertyChangedAuto(); OnHistoryConfigurationSelected(); }
+            get { return _dispensersFilter; }
+            set { _dispensersFilter = value; RaisePropertyChangedAuto(); OnDispensersFilterChanged(); }
         }
 
         private String _filter;
         /// <summary>
-        /// Gets or sets the configuration components filter.
+        /// Gets or sets the machines filter.
         /// </summary>
         public String Filter
         {
@@ -125,10 +105,13 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             set { _filter = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
         }
 
-        /// <summary>
-        /// Gets or sets the machines provider.
-        /// </summary>
-        public ISuggestionProvider MachinesProvider { get; set; }
+        private Spool _selectedSpool;
+        public Spool SelectedSpool
+        {
+            get { return _selectedSpool; }
+            set { _selectedSpool = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
 
         #endregion
 
@@ -150,20 +133,36 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         public RelayCommand RemoveIdsCommand { get; set; }
 
         /// <summary>
-        /// Gets or sets the set version configuration command.
+        /// Gets or sets the remove machine command.
         /// </summary>
-        public RelayCommand SetVersionConfigurationCommand { get; set; }
+        public RelayCommand RemoveMachineCommand { get; set; }
 
         /// <summary>
-        /// Gets or sets the set as default command.
+        /// Gets or sets the add machine command.
         /// </summary>
-        public RelayCommand SetAsDefaultCommand { get; set; }
+        public RelayCommand AddMachineCommand { get; set; }
 
         /// <summary>
-        /// Gets or sets the reset command.
+        /// Gets or sets the edit machine command.
         /// </summary>
-        public RelayCommand ResetCommand { get; set; }
+        public RelayCommand EditMachineCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the back to machines command.
+        /// </summary>
+        public RelayCommand BackToMachinesCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the add spool command.
+        /// </summary>
+        public RelayCommand AddSpoolCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the remove spool command.
+        /// </summary>
+        public RelayCommand RemoveSpoolCommand { get; set; }
+
+        public RelayCommand CloneMachineCommand { get; set; }
         #endregion
 
         #region Constructors
@@ -178,191 +177,48 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// </summary>
         public MainViewVM(INotificationProvider notification)
         {
-            CanWork = true;
-
+            MachinesAdapter = new ObservablesStaticCollections(ObservablesContext.CreateDefault());
             _notification = notification;
 
-            Configuration = new Configuration();
-            Configuration.Name = "Untitled";
-            Machine = new Machine();
-            Machine.Configuration = Configuration;
-
-            SaveCommand = new RelayCommand(Save, (x) => CanWork);
-            AddIdsCommand = new RelayCommand(AddIds, (x) => CanWork && Configuration.IdsPacks.Count < 8);
-            RemoveIdsCommand = new RelayCommand(RemoveIds, (x) => CanWork && SelectedIds != null);
-            SetVersionConfigurationCommand = new RelayCommand(SetVersionConfiguration, (x) => CanWork);
-            SetAsDefaultCommand = new RelayCommand(SetAsDefaultConfiguration, (x) => CanWork);
-            ResetCommand = new RelayCommand(Reset, () => CanWork);
+            _machines_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200));
+            _dispensers_action_timer = new ActionTimer(TimeSpan.FromMilliseconds(200));
 
-            MachinesProvider = new SuggestionProvider((filter) =>
-            {
-                return _db.Machines.Where(x => x.SerialNumber.StartsWith(filter)).ToList();
-            });
+            AddIdsCommand = new RelayCommand(AddIds, (x) => ActiveMachine != null && ActiveMachine.Configuration != null && ActiveMachine.Configuration.IdsPacks.Count < 8);
+            RemoveIdsCommand = new RelayCommand(RemoveIds, (x) => SelectedIds != null);
+            EditMachineCommand = new RelayCommand(() => LoadSelectedMachine(), () => SelectedMachine != null);
+            BackToMachinesCommand = new RelayCommand(() => View.NavigateTo(MachineDesignerNavigationView.MachinesView));
+            SaveCommand = new RelayCommand(SaveMachine);
+            AddMachineCommand = new RelayCommand(AddNewMachine);
+            RemoveMachineCommand = new RelayCommand(RemoveSelectedMachine, () => SelectedMachine != null);
+            AddSpoolCommand = new RelayCommand(AddNewSpool);
+            RemoveSpoolCommand = new RelayCommand(RemoveSpool, () => SelectedSpool != null);
+            CloneMachineCommand = new RelayCommand(CloneMachine, () => SelectedMachine != null);
         }
-
         #endregion
 
         #region Application Ready
 
-        public async override void OnApplicationReady()
+        public override async void OnApplicationReady()
         {
-            await InitCollections();
+            MachinesAdapter.MachineVersions = (await MachinesAdapter.Context.MachineVersions.ToListAsync()).ToObservableCollection();
         }
 
         #endregion
 
-        private Task InitCollections()
-        {
-            return Task.Factory.StartNew(() =>
-            {
-                CanWork = false;
-
-                _db = ObservablesContext.CreateDefault();
-
-                Adapter = new ObservablesStaticCollections();
-                Adapter.ApplicationDisplayPanelVersions = _db.ApplicationDisplayPanelVersions.ToObservableCollection();
-                Adapter.ApplicationFirmwareVersions = _db.ApplicationFirmwareVersions.ToObservableCollection();
-                Adapter.ApplicationOsVersions = _db.ApplicationOsVersions.ToObservableCollection();
-                Adapter.EmbeddedFirmwareVersions = _db.EmbeddedFirmwareVersions.ToObservableCollection();
-                Adapter.DispenserTypes = _db.DispenserTypes.ToObservableCollection();
-                Adapter.LiquidTypes = _db.LiquidTypes.ToObservableCollection();
-                Adapter.MidTankTypes = _db.MidTankTypes.ToObservableCollection();
-                Adapter.CartridgeTypes = _db.CartridgeTypes.ToObservableCollection();
-                Adapter.IdsPackFormulas = _db.IdsPackFormulas.ToObservableCollection();
-                Adapter.HardwareVersions = _db.HardwareVersions.ToObservableCollection();
-                Adapter.MachineVersions = _db.MachineVersions.ToObservableCollection();
-                Adapter.Organizations = _db.Organizations.ToObservableCollection();
-
-                Adapter.InitCollectionSources();
-
-                CanWork = true;
-            });
-        }
-
-        private void Reset()
-        {
-            using (_notification.PushTaskItem("Resetting designer..."))
-            {
-                SelectedMachine = null;
-                Machine = new Machine();
-                Configuration = new Configuration();
-                History = new ObservableCollection<Configuration>();
-                SelectedHistoryConfiguration = null;
-                Filter = String.Empty;
-                InitCollections();
-            }
-        }
-
-        #region Virtual Methods
-
-        /// <summary>
-        /// Called when the selected machine has changed.
-        /// </summary>
-        protected virtual void OnSelectedMachineChanged()
-        {
-            if (SelectedMachine != null)
-            {
-                CanWork = false;
-
-                using (_notification.PushTaskItem("Loading machine configuration..."))
-                {
-                    Task.Factory.StartNew(() =>
-                    {
-                        InitCollections().Wait();
-                        Machine = _db.Machines.Where(x => x.Guid == SelectedMachine.Guid).Include(x => x.Organization).SingleOrDefault(x => x.Guid == SelectedMachine.Guid);
-                        Configuration = _db.Adapter.GetConfiguration(x => x.Guid == Machine.ConfigurationGuid);
-
-                        SetHistory();
-
-                        _original_configuration = Configuration.Clone();
-                    });
-                }
-
-                CanWork = true;
-            }
-            else
-            {
-                History = new ObservableCollection<Configuration>();
-            }
-        }
-
-        /// <summary>
-        /// Called when the history configuration has been selected
-        /// </summary>
-        protected virtual void OnHistoryConfigurationSelected()
+        private void OnDispensersFilterChanged()
         {
-            if (SelectedHistoryConfiguration != null && CanWork)
+            if (!String.IsNullOrWhiteSpace(DispensersFilter))
             {
-                using (_notification.PushTaskItem("Loading Configuration..."))
+                _dispensers_action_timer.ResetReplace(() =>
                 {
                     Task.Factory.StartNew(() =>
                     {
-                        CanWork = false;
-
-                        SelectedHistoryConfiguration = _db.Adapter.GetConfiguration(x => x.Guid == SelectedHistoryConfiguration.Guid);
-                        Configuration = SelectedHistoryConfiguration;
-                        Machine.Configuration = Configuration;
-
-                        CanWork = true;
+                        ActiveMachineAdapter.Dispensers = ActiveMachineAdapter.Context.Dispensers.Where(x => x.SerialNumber.ToLower().StartsWith(DispensersFilter.ToLower())).ToSynchronizedObservableCollection();
                     });
-                }
-            }
-        }
-
-        /// <summary>
-        /// Called when the filter has changed
-        /// </summary>
-        protected virtual void OnFilterChanged()
-        {
-            List<ICollectionView> collections = new List<ICollectionView>();
-            collections.Add(Adapter.ApplicationFirmwareVersionsViewSource);
-            collections.Add(Adapter.ApplicationDisplayPanelVersionsViewSource);
-            collections.Add(Adapter.ApplicationOsVersionsViewSource);
-            collections.Add(Adapter.EmbeddedFirmwareVersionsViewSource);
-            collections.Add(Adapter.DispenserTypesViewSource);
-            collections.Add(Adapter.CartridgeTypesViewSource);
-            collections.Add(Adapter.LiquidTypesViewSource);
-            collections.Add(Adapter.MidTankTypesViewSource);
-            collections.Add(Adapter.HardwareVersionsViewSource);
-
-            foreach (var collection in collections)
-            {
-                collection.Filter = (x) =>
-                {
-                    foreach (var prop in x.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(y => y.PropertyType == typeof(String)))
-                    {
-                        String value = prop.GetValue(x).ToStringSafe();
-
-                        if (value != null && Filter != null)
-                        {
-                            if (value.ToLower().Contains(Filter.ToLower()))
-                            {
-                                return true;
-                            }
-                        }
-                    }
-
-                    return false;
-                };
+                });
             }
         }
 
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Sets the selected machine without any further processing.
-        /// </summary>
-        /// <param name="machine">The machine.</param>
-        public void SetSelectedMachine(Machine machine)
-        {
-            _machine = machine;
-            RaisePropertyChanged(nameof(Machine));
-        }
-
-        #endregion
-
         #region Drag Drop Handlers
 
         /// <summary>
@@ -372,7 +228,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="idsPack2">The ids pack2.</param>
         public void DropIdsPack(IdsPack idsPack1, IdsPack idsPack2)
         {
-            Configuration.IdsPacks.Swap(idsPack1, idsPack2);
+            ActiveMachine.Configuration.IdsPacks.Swap(idsPack1, idsPack2);
         }
 
         /// <summary>
@@ -381,8 +237,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="applicationDisplayPanelVersion">The application display panel version.</param>
         public void DropTouchPanel(ApplicationDisplayPanelVersion applicationDisplayPanelVersion)
         {
-            Configuration.ApplicationDisplayPanelVersion = applicationDisplayPanelVersion;
-            Configuration.ApplicationDisplayPanelVersionGuid = applicationDisplayPanelVersion.Guid;
+            ActiveMachine.Configuration.ApplicationDisplayPanelVersion = applicationDisplayPanelVersion;
+            ActiveMachine.Configuration.ApplicationDisplayPanelVersionGuid = applicationDisplayPanelVersion.Guid;
         }
 
         /// <summary>
@@ -391,8 +247,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="applicationFirmwareVersion">The application firmware version.</param>
         public void DropApplicationFirmwareVersion(ApplicationFirmwareVersion applicationFirmwareVersion)
         {
-            Configuration.ApplicationFirmwareVersion = applicationFirmwareVersion;
-            Configuration.ApplicationFirmwareVersionGuid = applicationFirmwareVersion.Guid;
+            ActiveMachine.Configuration.ApplicationFirmwareVersion = applicationFirmwareVersion;
+            ActiveMachine.Configuration.ApplicationFirmwareVersionGuid = applicationFirmwareVersion.Guid;
         }
 
         /// <summary>
@@ -401,8 +257,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="hardwareVersion">The hardware version.</param>
         public void DropHardwareVersion(HardwareVersion hardwareVersion)
         {
-            Configuration.HardwareVersion = hardwareVersion;
-            Configuration.HardwareVersionGuid = hardwareVersion.Guid;
+            ActiveMachine.Configuration.HardwareVersion = hardwareVersion;
+            ActiveMachine.Configuration.HardwareVersionGuid = hardwareVersion.Guid;
         }
 
         /// <summary>
@@ -411,8 +267,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="embeddedFirmwareVersion">The embedded firmware version.</param>
         public void DropEmbeddedFirmware(EmbeddedFirmwareVersion embeddedFirmwareVersion)
         {
-            Configuration.EmbeddedFirmwareVersion = embeddedFirmwareVersion;
-            Configuration.EmbeddedFirmwareVersionGuid = embeddedFirmwareVersion.Guid;
+            ActiveMachine.Configuration.EmbeddedFirmwareVersion = embeddedFirmwareVersion;
+            ActiveMachine.Configuration.EmbeddedFirmwareVersionGuid = embeddedFirmwareVersion.Guid;
         }
 
         /// <summary>
@@ -421,30 +277,30 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// <param name="applicationOsVersion">The application os version.</param>
         public void DropApplicationOsVersion(ApplicationOsVersion applicationOsVersion)
         {
-            Configuration.ApplicationOsVersion = applicationOsVersion;
-            Configuration.ApplicationOsVersionGuid = applicationOsVersion.Guid;
+            ActiveMachine.Configuration.ApplicationOsVersion = applicationOsVersion;
+            ActiveMachine.Configuration.ApplicationOsVersionGuid = applicationOsVersion.Guid;
         }
 
         /// <summary>
-        /// Drops the type of the cartridge.
+        /// Drops the dispenser.
         /// </summary>
-        /// <param name="cartridgeType">Type of the cartridge.</param>
+        /// <param name="dispenser">The dispenser.</param>
         /// <param name="idsPack">The ids pack.</param>
-        public void DropCartridgeType(CartridgeType cartridgeType, IdsPack idsPack)
+        public void DropDispenser(Dispenser dispenser, IdsPack idsPack)
         {
-            idsPack.CartridgeType = cartridgeType;
-            idsPack.CartridgeTypeGuid = cartridgeType.Guid;
+            idsPack.Dispenser = dispenser;
+            idsPack.DispenserGuid = dispenser.Guid;
         }
 
         /// <summary>
-        /// Drops the dispenser.
+        /// Drops the type of the cartridge.
         /// </summary>
-        /// <param name="dispenserType">The dispenser.</param>
+        /// <param name="cartridgeType">Type of the cartridge.</param>
         /// <param name="idsPack">The ids pack.</param>
-        public void DropDispenserType(DispenserType dispenserType, IdsPack idsPack)
+        public void DropCartridgeType(CartridgeType cartridgeType, IdsPack idsPack)
         {
-            idsPack.DispenserType = dispenserType;
-            idsPack.DispenserTypeGuid = dispenserType.Guid;
+            idsPack.CartridgeType = cartridgeType;
+            idsPack.CartridgeTypeGuid = cartridgeType.Guid;
         }
 
         /// <summary>
@@ -490,7 +346,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// </summary>
         private void RemoveIds()
         {
-            _db.IdsPacks.Remove(SelectedIds);
+            ActiveMachineAdapter.Context.IdsPacks.Remove(SelectedIds);
             SelectedIds = null;
         }
 
@@ -499,104 +355,164 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         /// </summary>
         private void AddIds()
         {
-            _db.IdsPacks.Add(new IdsPack() { Configuration = Configuration });
+            ActiveMachineAdapter.Context.IdsPacks.Add(new IdsPack() { Configuration = ActiveMachine.Configuration });
             InvalidateRelayCommands();
         }
 
-        /// <summary>
-        /// Saves the current machine configuration.
-        /// </summary>
-        private async void Save()
+        private async void LoadSelectedMachine(bool newMachine = false, bool clone = false, MachineVersion selectedVersion = null)
         {
-            foreach (var ids in Configuration.IdsPacks)
+            using (_notification.PushTaskItem("Loading machine details..."))
             {
-                ids.PackIndex = Configuration.IdsPacks.IndexOf(ids);
-                ids.Configuration = Configuration;
-                ids.ConfigurationGuid = Configuration.Guid;
+                try
+                {
+                    IsFree = false;
+
+                    if (ActiveMachineAdapter != null)
+                    {
+                        ActiveMachineAdapter.Context.Dispose();
+                    }
+
+                    ActiveMachineAdapter = new ObservablesStaticCollections(ObservablesContext.CreateDefault());
+                    ActiveMachineAdapter.Organizations = (await ActiveMachineAdapter.Context.Organizations.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.MachineVersions = (await ActiveMachineAdapter.Context.MachineVersions.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.Rmls = (await ActiveMachineAdapter.Context.Rmls.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.ColorSpaces = (await ActiveMachineAdapter.Context.ColorSpaces.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.SpoolTypes = (await ActiveMachineAdapter.Context.SpoolTypes.ToListAsync()).ToObservableCollection();
+
+                    ActiveMachineAdapter.ApplicationDisplayPanelVersions = (await ActiveMachineAdapter.Context.ApplicationDisplayPanelVersions.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.ApplicationFirmwareVersions = (await ActiveMachineAdapter.Context.ApplicationFirmwareVersions.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.ApplicationOsVersions = (await ActiveMachineAdapter.Context.ApplicationOsVersions.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.EmbeddedFirmwareVersions = (await ActiveMachineAdapter.Context.EmbeddedFirmwareVersions.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.DispenserTypes = (await ActiveMachineAdapter.Context.DispenserTypes.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.LiquidTypes = (await ActiveMachineAdapter.Context.LiquidTypes.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.MidTankTypes = (await ActiveMachineAdapter.Context.MidTankTypes.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.CartridgeTypes = (await ActiveMachineAdapter.Context.CartridgeTypes.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.IdsPackFormulas = (await ActiveMachineAdapter.Context.IdsPackFormulas.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.HardwareVersions = (await ActiveMachineAdapter.Context.HardwareVersions.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.MachineVersions = (await ActiveMachineAdapter.Context.MachineVersions.ToListAsync()).ToObservableCollection();
+                    ActiveMachineAdapter.Organizations = (await ActiveMachineAdapter.Context.Organizations.ToListAsync()).ToObservableCollection();
+
+                    if (!newMachine)
+                    {
+                        ActiveMachine = (await new MachineBuilder(ActiveMachineAdapter.Context).Set(SelectedMachine.Guid).WithOrganization().WithConfiguration().WithSpools().BuildAsync());
+
+                        if (clone)
+                        {
+                            ActiveMachine = ActiveMachine.Clone();
+                            ActiveMachine.Name = "";
+                            ActiveMachine.SerialNumber = "";
+                            ActiveMachineAdapter.Context.Machines.Add(ActiveMachine);
+                        }
+                    }
+                    else
+                    {
+                        if (selectedVersion == null)
+                        {
+                            ActiveMachine = new Machine();
+                            ActiveMachine.Configuration = new Configuration();
+                            ActiveMachineAdapter.Context.Machines.Add(ActiveMachine);
+                        }
+                        else
+                        {
+                            ActiveMachine = selectedVersion.CreatePrototypeMachine(ActiveMachineAdapter.Context);
+                            ActiveMachineAdapter.Context.Machines.Add(ActiveMachine);
+                        }
+                    }
+
+                    View.NavigateTo(MachineDesignerNavigationView.MachineDetailsView);
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, $"Error loading machine details for serial number {SelectedMachine.SerialNumber}");
+                    _notification.ShowError($"An error occurred while trying to load the selected machine details.\n{ex.Message}");
+                }
+                finally
+                {
+                    IsFree = true;
+                    InvalidateRelayCommands();
+                }
             }
+        }
 
-            //Validate
+        private async void SaveMachine()
+        {
+            foreach (var ids in ActiveMachine.Configuration.IdsPacks)
+            {
+                ids.PackIndex = ActiveMachine.Configuration.IdsPacks.IndexOf(ids);
+                ids.Configuration = ActiveMachine.Configuration;
+                ids.ConfigurationGuid = ActiveMachine.Configuration.Guid;
+            }
 
             List<String> errors = new List<string>();
 
-            if (Machine.MachineVersion == null)
+            if (ActiveMachine.MachineVersion == null)
             {
                 errors.Add("Machine version is required.");
             }
 
-            if (Machine.Name.IsNullOrWhiteSpace())
+            if (ActiveMachine.Name.IsNullOrWhiteSpace())
             {
                 errors.Add("Machine name is required.");
             }
 
-            if (Machine.Organization == null)
+            if (ActiveMachine.Organization == null)
             {
                 errors.Add("Machine organization is required.");
             }
 
-            if (Machine.SerialNumber.IsNullOrWhiteSpace())
+            if (ActiveMachine.SerialNumber.IsNullOrWhiteSpace())
             {
                 errors.Add("Machine serial number is required.");
             }
 
-            if (Configuration.Name.IsNullOrWhiteSpace())
-            {
-                errors.Add("Configuration name is required.");
-            }
-
-            if (Configuration.ApplicationDisplayPanelVersion == null)
+            if (ActiveMachine.Configuration.ApplicationDisplayPanelVersion == null)
             {
                 errors.Add("Touch Panel is required.");
             }
 
-            if (Configuration.ApplicationFirmwareVersion == null)
+            if (ActiveMachine.Configuration.ApplicationFirmwareVersion == null)
             {
                 errors.Add("Application firmware is required.");
             }
 
-            if (Configuration.ApplicationOsVersion == null)
+            if (ActiveMachine.Configuration.ApplicationOsVersion == null)
             {
                 errors.Add("Application operation system is required.");
             }
 
-            if (Configuration.EmbeddedFirmwareVersion == null)
+            if (ActiveMachine.Configuration.EmbeddedFirmwareVersion == null)
             {
                 errors.Add("Embedded firmware is required.");
             }
 
-            if (Configuration.HardwareVersion == null)
+            if (ActiveMachine.Configuration.HardwareVersion == null)
             {
                 errors.Add("Hardware version is required.");
             }
 
-            foreach (var pack in Configuration.IdsPacks)
+            foreach (var pack in ActiveMachine.Configuration.IdsPacks)
             {
-                if (pack.LiquidType != null || pack.CartridgeType != null || pack.DispenserType != null || pack.IdsPackFormula != null || pack.MidTankType != null)
+                if (pack.LiquidType != null || pack.CartridgeType != null || pack.Dispenser != null || pack.IdsPackFormula != null || pack.MidTankType != null)
                 {
-                    if (pack.Name.IsNullOrWhiteSpace())
-                    {
-                        errors.Add(String.Format("Name is required on IDS pack number '{0}'.", Configuration.IdsPacks.IndexOf(pack) + 1));
-                        continue;
-                    }
                     if (pack.CartridgeType == null)
                     {
-                        errors.Add(String.Format("Cartridge type is required on IDS pack '{0}'.", pack.Name));
+                        errors.Add(String.Format("Cartridge type is required on IDS pack '{0}'.", pack.PackIndex));
                     }
-                    if (pack.DispenserType == null)
+                    if (pack.Dispenser == null)
                     {
-                        errors.Add(String.Format("Dispenser type is required on IDS pack '{0}'.", pack.Name));
+                        errors.Add(String.Format("Dispenser is required on IDS pack '{0}'.", pack.PackIndex));
                     }
                     if (pack.LiquidType == null)
                     {
-                        errors.Add(String.Format("Liquid type is required on IDS pack '{0}'.", pack.Name));
+                        errors.Add(String.Format("Liquid type is required on IDS pack '{0}'.", pack.PackIndex));
                     }
                     if (pack.MidTankType == null)
                     {
-                        errors.Add(String.Format("Mid Tank type is required on IDS pack '{0}'.", pack.Name));
+                        errors.Add(String.Format("Mid Tank type is required on IDS pack '{0}'.", pack.PackIndex));
                     }
                     if (pack.IdsPackFormula == null)
                     {
-                        errors.Add(String.Format("Formula type is required on IDS pack '{0}'.", pack.Name));
+                        errors.Add(String.Format("Formula type is required on IDS pack '{0}'.", pack.PackIndex));
                     }
 
                     pack.IsEmpty = false;
@@ -604,172 +520,144 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                 else
                 {
                     pack.IsEmpty = true;
-                    pack.Name = String.Empty;
                 }
             }
 
+            foreach (var pack in ActiveMachine.Configuration.IdsPacks.Where(x => x.Dispenser != null))
+            {
+                if (ActiveMachine.Configuration.IdsPacks.Where(x => x.Dispenser == pack.Dispenser).Count() > 1)
+                {
+                    errors.Add($"Dispenser '{pack.Dispenser.SerialNumber}' is installed on multiple IDS packs.");
+                }
+
+                if (ActiveMachineAdapter.Context.IdsPacks.Count(x => x.ConfigurationGuid != pack.ConfigurationGuid && x.DispenserGuid == pack.DispenserGuid) > 0)
+                {
+                    errors.Add($"Dispenser '{pack.Dispenser.SerialNumber}' is already installed on a different machine.");
+                }
+            }
+
+            if (ActiveMachine.Spools.GroupBy(x => x.SpoolType).Any(x => x.Count() > 1))
+            {
+                errors.Add($"Same spool type is registered multiple times.");
+            }
+
             if (errors.Count > 0)
             {
                 String errorsString = "Please fix the following validation errors before trying to save." + Environment.NewLine + Environment.NewLine;
-                errorsString += String.Join(Environment.NewLine, errors);
+                errorsString += String.Join(Environment.NewLine, errors.Distinct());
                 _notification.ShowError(errorsString);
                 return;
             }
 
-            //Validate
-
             try
             {
-                CanWork = false;
+                IsFree = false;
 
-                using (_notification.PushTaskItem("Saving Machine Configuration..."))
+                using (_notification.PushTaskItem("Saving Machine Details..."))
                 {
-                    if (!_db.Machines.Any(x => x.SerialNumber.ToLower() == Machine.SerialNumber.ToLower()))
-                    {
-                        if (!_notification.ShowQuestion("The specified machine serial number does not exist. Do you wish to create a new machine?"))
-                        {
-                            CanWork = true;
-                            return;
-                        }
-                        else
-                        {
-                            Machine.Configuration = Configuration;
-                            Configuration.CreationDate = DateTime.UtcNow;
-                            Machine.ProductionDate = DateTime.UtcNow;
-
-                            _db.Machines.Add(Machine);
-                            _db.MachinesConfigurations.Add(new MachinesConfiguration()
-                            {
-                                Configuration = Configuration,
-                                Machine = Machine,
-                            });
-                        }
-                    }
-                    else
-                    {
-                        bool add_history = History.Count == 0 || _original_configuration.Name != Configuration.Name;
 
-                        if (add_history)
-                        {
-                            _db.Configurations.Add(_original_configuration);
+                    ActiveMachine.ConfigurationGuid = ActiveMachine.Configuration.Guid;
+                    ActiveMachine.LastUpdated = DateTime.UtcNow;
+                    ActiveMachine.ProductionDate = DateTime.UtcNow;
+                    await ActiveMachineAdapter.Context.SaveChangesAsync();
 
-                            _db.MachinesConfigurations.Add(new MachinesConfiguration()
-                            {
-                                Configuration = _original_configuration,
-                                Machine = Machine
-                            });
-                        }
+                    if (SelectedMachine != null)
+                    {
+                        await SelectedMachine.Reload(MachinesAdapter.Context);
                     }
-
-                    await _db.SaveChangesAsync();
-                    OnSelectedMachineChanged();
-
                 }
             }
             catch (Exception ex)
             {
-                _notification.ShowError("An error occurred while trying to save the configuration" + Environment.NewLine + ex.Message);
+                LogManager.Log(ex, "Error saving machine details.");
+                _notification.ShowError("An error occurred while trying to save the machine details" + Environment.NewLine + ex.Message);
             }
             finally
             {
-                CanWork = true;
+                IsFree = true;
                 InvalidateRelayCommands();
             }
         }
 
-        /// <summary>
-        /// Sets the specified machine history.
-        /// </summary>
-        /// <param name="machine">The machine.</param>
-        private void SetHistory()
+        private void AddNewMachine()
         {
-            History = _db.MachinesConfigurations.Where(x => x.MachineGuid == Machine.Guid).Select(x => x.Configuration).ToObservableCollection();
-            //History.Insert(0, Machine.Configuration);
+            MachineCreationDialogVM vm = new MachineCreationDialogVM();
+            vm.MachineVersions = MachinesAdapter.MachineVersions.ToList();
+            _notification.ShowModalDialog<MachineCreationDialogVM, Views.MachineCreationDialog>(vm, (x) =>
+            {
+                if (String.IsNullOrWhiteSpace(vm.SelectedMachineVersion.PrototypeMachineData))
+                {
+                    _notification.ShowError("The selected version does not contain any prototype machine data.");
+                    return;
+                }
+
+                LoadSelectedMachine(true, false, vm.SelectedMachineVersion);
+            }, () => { });
         }
 
-        /// <summary>
-        /// Sets the current configuration to the selected machine version default configuration.
-        /// </summary>
-        private async void SetVersionConfiguration()
+        private async void RemoveSelectedMachine()
         {
-            if (Machine.MachineVersion != null)
+            if (_notification.ShowQuestion("Are you sure you want to delete the selected machine?"))
             {
-                using (_notification.PushTaskItem("Applying default configuration..."))
+                using (_notification.PushTaskItem("Removing machine..."))
                 {
-                    CanWork = false;
-
-                    await Task.Factory.StartNew(() =>
+                    try
                     {
-                        var version = _db.MachineVersions.Where(x => x.Guid == Machine.MachineVersion.Guid).Include(x => x.DefaultConfiguration).FirstOrDefault();
-                        var version_config = _db.Adapter.GetConfiguration(x => x.Guid == version.DefaultConfiguration.Guid);
-                        Configuration = version_config.Clone();
-                        Machine.Configuration = Configuration;
-                    });
-
-                    CanWork = true;
+                        IsFree = false;
+                        await SelectedMachine.DeleteCascadeAsync(MachinesAdapter.Context);
+                        MachinesAdapter.Context.Machines.Remove(SelectedMachine);
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, $"Error removing machine {SelectedMachine.SerialNumber}.");
+                        _notification.ShowError($"An error occurred while trying to delete the selected machine.\n{ex.Message}");
+                    }
+                    finally
+                    {
+                        IsFree = true;
+                    }
                 }
             }
-            else
+        }
+
+        #endregion
+
+        private void CloneMachine()
+        {
+            LoadSelectedMachine(false, true);
+        }
+
+        private void AddNewSpool()
+        {
+            _activeMachineAdapter.Context.Spools.Add(new Spool()
             {
-                _notification.ShowError("No machine version selected.");
-            }
+                Machine = ActiveMachine,
+            });
         }
 
-        /// <summary>
-        /// Sets the current configuration as a default machine version configuration.
-        /// </summary>
-        private void SetAsDefaultConfiguration()
+        private void RemoveSpool()
         {
-            _notification.ShowModalDialog<MachineVersionDialogVM>(async (vm) =>
+            if (SelectedSpool != null)
             {
-                CanWork = false;
+                _activeMachineAdapter.Context.Spools.Remove(SelectedSpool);
+                ActiveMachine.Spools.Remove(SelectedSpool);
+            }
+        }
 
-                try
+        private void OnFilterChanged()
+        {
+            if (Filter != null)
+            {
+                _machines_action_timer.ResetReplace(() =>
                 {
-                    using (_notification.PushTaskItem("Saving Default Configuration..."))
+                    Task.Factory.StartNew(() =>
                     {
-                        if (vm.SelectedVersion != null)
-                        {
-                            var version = _db.MachineVersions.Where(x => x.Guid == vm.SelectedVersion.Guid).Include(x => x.DefaultConfiguration).SingleOrDefault(x => x.Guid == vm.SelectedVersion.Guid);
-
-                            _db.Configurations.Remove(version.DefaultConfiguration);
-
-                            var cloned = Configuration.Clone();
-                            _db.Configurations.Add(cloned);
-                            version.DefaultConfiguration = cloned;
-
-                            await _db.SaveChangesAsync();
-                        }
-                        else
-                        {
-                            MachineVersion newVersion = new MachineVersion();
-                            newVersion.Version = vm.Version;
-                            newVersion.Name = vm.VersionName;
-
-                            var cloned = Configuration.Clone();
-
-                            _db.Configurations.Add(cloned);
-                            newVersion.DefaultConfiguration = cloned;
-                            _db.MachineVersions.Add(newVersion);
-                            await _db.SaveChangesAsync();
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _notification.ShowError(ex.Message);
-                }
-                finally
-                {
-                    CanWork = true;
-                }
-
-            }, () =>
-            {
-
-            });
+                        IsFree = false;
+                        MachinesAdapter.Machines = MachinesAdapter.Context.Machines.Where(x => x.SerialNumber.StartsWith(Filter)).Include(x => x.Organization).Include(x => x.MachineVersion).ToSynchronizedObservableCollection();
+                        IsFree = true;
+                    });
+                });
+            }
         }
-
-        #endregion
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml
new file mode 100644
index 000000000..97eceaa7d
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml
@@ -0,0 +1,707 @@
+<UserControl x:Class="Tango.MachineStudio.MachineDesigner.Views.ConfigurationView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:dragAndDrop="clr-namespace:Tango.DragAndDrop;assembly=Tango.DragAndDrop"
+             xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
+             xmlns:fa="http://schemas.fontawesome.io/icons/"
+             xmlns:providers="clr-namespace:Tango.MachineStudio.MachineDesigner.AutoComplete"
+             xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
+             xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="720" d:DesignWidth="1280" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <UserControl.Resources>
+        <sharedConverters:ColorToIntegerConverter x:Key="ColorToIntegerConverter" />
+
+        <Style x:Key="draggableGrid" TargetType="Grid">
+            <Setter Property="RenderTransform">
+                <Setter.Value>
+                    <ScaleTransform ScaleX="1" ScaleY="1"></ScaleTransform>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="RenderTransformOrigin" Value="0.5,0.5"></Setter>
+            <Setter Property="Background" Value="Transparent"></Setter>
+            <Setter Property="dragAndDrop:DragAndDropService.Draggable" Value="True"></Setter>
+            <Setter Property="dragAndDrop:DragAndDropService.Droppable" Value="True"></Setter>
+            <Setter Property="dragAndDrop:DragAndDropService.DraggingSurface" Value="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}"></Setter>
+            <Style.Triggers>
+                <Trigger Property="dragAndDrop:DragAndDropService.IsDraggableOver" Value="True">
+                    <Setter Property="Opacity" Value="0.5"></Setter>
+                    <Trigger.EnterActions>
+                        <BeginStoryboard>
+                            <Storyboard>
+                                <DoubleAnimation To="0.95" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleX"></DoubleAnimation>
+                                <DoubleAnimation To="0.95" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleY"></DoubleAnimation>
+                            </Storyboard>
+                        </BeginStoryboard>
+                    </Trigger.EnterActions>
+                    <Trigger.ExitActions>
+                        <BeginStoryboard>
+                            <Storyboard>
+                                <DoubleAnimation To="1" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleX"></DoubleAnimation>
+                                <DoubleAnimation To="1" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleY"></DoubleAnimation>
+                            </Storyboard>
+                        </BeginStoryboard>
+                    </Trigger.ExitActions>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+
+        <Style TargetType="Expander" BasedOn="{StaticResource {x:Type Expander}}">
+            <Setter Property="HeaderTemplate">
+                <Setter.Value>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding}" FontSize="13"></TextBlock>
+                    </DataTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+
+    <Grid>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="477*"/>
+                <ColumnDefinition Width="310" x:FieldModifier="public" x:Name="panelColumnDefinition" />
+            </Grid.ColumnDefinitions>
+
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="200"/>
+                    <ColumnDefinition Width="1*"/>
+                </Grid.ColumnDefinitions>
+
+                <Grid Grid.Column="1">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="90"/>
+                        <RowDefinition Height="631*"/>
+                    </Grid.RowDefinitions>
+
+                    <Grid ClipToBounds="False">
+
+                    </Grid>
+
+                    <Viewbox MaxWidth="1200" Grid.Row="1" >
+                        <Grid VerticalAlignment="Top">
+
+                            <Image IsHitTestVisible="False" Source="../Images/machine-full-fx.png" MaxWidth="800" RenderOptions.BitmapScalingMode="Fant">
+                                <Image.Effect>
+                                    <DropShadowEffect ShadowDepth="0" BlurRadius="20" Opacity="1" RenderingBias="Performance" Color="DimGray"></DropShadowEffect>
+                                </Image.Effect>
+                            </Image>
+
+                            <Canvas ClipToBounds="False" x:Name="canvas">
+
+                                <Grid x:Name="hardwareGrid" Style="{StaticResource draggableGrid}" Width="118" Height="27" Canvas.Left="342" Canvas.Top="80" Background="#6B303030" IsHitTestVisible="True" dragAndDrop:DragAndDropService.Drop="MachineDrop">
+                                    <Border BorderBrush="#6C6C6C" BorderThickness="1" IsHitTestVisible="False">
+                                        <StackPanel Orientation="Horizontal">
+                                            <Image Source="../Images/hardware.png" Width="10" VerticalAlignment="Center" Margin="5" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                            <TextBlock Padding="2 0 2 0" VerticalAlignment="Center" TextAlignment="Center" Foreground="Gainsboro" IsHitTestVisible="False" FontSize="6" TextWrapping="Wrap">
+                                            <Run Text="{Binding ActiveMachine.Configuration.HardwareVersion.Name}"></Run>
+                                            <Run Text="{Binding ActiveMachine.Configuration.HardwareVersion.Version}"></Run>
+                                            </TextBlock>
+                                        </StackPanel>
+                                    </Border>
+                                </Grid>
+
+                                <TextBlock Canvas.Left="532" FontStyle="Italic" Foreground="Gray" Canvas.Top="-22">Hardware Version</TextBlock>
+                                <Grid Width="97" Height="90" Canvas.Left="431" Canvas.Top="-13">
+                                    <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                    <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                </Grid>
+
+                                <TextBlock Canvas.Top="222" Canvas.Left="446" FontStyle="Italic" Foreground="Gray">Add IDS</TextBlock>
+                                <Grid Width="23" Height="20" Canvas.Top="231" Canvas.Left="414">
+                                    <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                    <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                </Grid>
+
+                                <TextBlock Canvas.Top="255" Canvas.Left="500" FontStyle="Italic" Foreground="Gray">Remove IDS</TextBlock>
+                                <Grid Width="35" Height="8" Canvas.Top="264" Canvas.Left="460">
+                                    <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                </Grid>
+
+                                <Button Command="{Binding AddIdsCommand}" Style="{StaticResource MaterialDesignFlatButton}" Height="24" Width="24" Padding="0" Canvas.Left="402" Canvas.Top="253">
+                                    <materialDesign:PackIcon Kind="Plus" Width="24" Height="24"></materialDesign:PackIcon>
+                                </Button>
+
+                                <Button Command="{Binding RemoveIdsCommand}" Style="{StaticResource MaterialDesignFlatButton}" Height="24" Width="24" Padding="0" Canvas.Left="430" Canvas.Top="252">
+                                    <materialDesign:PackIcon Kind="Minus" Width="24" Height="24"></materialDesign:PackIcon>
+                                </Button>
+
+                                <UniformGrid Width="310" Canvas.Top="295" Canvas.Left="420" Rows="1" Columns="8" TextElement.FontSize="9">
+                                    <TextBlock HorizontalAlignment="Center">1</TextBlock>
+                                    <TextBlock HorizontalAlignment="Center">2</TextBlock>
+                                    <TextBlock HorizontalAlignment="Center">3</TextBlock>
+                                    <TextBlock HorizontalAlignment="Center">4</TextBlock>
+                                    <TextBlock HorizontalAlignment="Center">5</TextBlock>
+                                    <TextBlock HorizontalAlignment="Center">6</TextBlock>
+                                    <TextBlock HorizontalAlignment="Center">7</TextBlock>
+                                    <TextBlock HorizontalAlignment="Center">8</TextBlock>
+                                </UniformGrid>
+                                <Grid x:Name="gridIds" Width="310" Height="195" Canvas.Top="314" Canvas.Left="420">
+                                    <ListBox ItemsSource="{Binding ActiveMachine.Configuration.IdsPacks}" SelectedItem="{Binding SelectedIds}" ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+                                        <ListBox.ItemContainerStyle>
+                                            <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                <Setter Property="Padding" Value="0"></Setter>
+                                                <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                            </Style>
+                                        </ListBox.ItemContainerStyle>
+                                        <ItemsControl.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <UniformGrid Columns="8"></UniformGrid>
+                                            </ItemsPanelTemplate>
+                                        </ItemsControl.ItemsPanel>
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate>
+                                                <Grid dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Drop="OnDropOnIdsPack">
+                                                    <Grid.RowDefinitions>
+                                                        <RowDefinition Height="1*"/>
+                                                        <RowDefinition Height="30"/>
+                                                    </Grid.RowDefinitions>
+                                                    <Grid.Style>
+                                                        <Style TargetType="Grid" BasedOn="{StaticResource draggableGrid}">
+                                                            <Style.Triggers>
+
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </Grid.Style>
+                                                    <UniformGrid Columns="1" Rows="2">
+                                                        <Grid Margin="2">
+                                                            <Image IsHitTestVisible="False" Source="../Images/dispenser.png" RenderOptions.BitmapScalingMode="Fant">
+                                                                <Image.Style>
+                                                                    <Style TargetType="Image">
+                                                                        <Style.Triggers>
+                                                                            <DataTrigger Binding="{Binding Dispenser}" Value="{x:Null}">
+                                                                                <Setter Property="Opacity" Value="0.2"></Setter>
+                                                                            </DataTrigger>
+                                                                        </Style.Triggers>
+                                                                    </Style>
+                                                                </Image.Style>
+                                                            </Image>
+                                                            <Rectangle IsHitTestVisible="False" Margin="14 25 13 34">
+                                                                <Rectangle.Fill>
+                                                                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,0.8" Opacity="0.8">
+                                                                        <GradientStop Offset="0" Color="Transparent" />
+                                                                        <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                                    </LinearGradientBrush>
+                                                                </Rectangle.Fill>
+                                                            </Rectangle>
+                                                        </Grid>
+
+                                                        <Grid Margin="2">
+                                                            <Image IsHitTestVisible="False" Stretch="Fill" Source="../Images/mid-tank.png" RenderOptions.BitmapScalingMode="Fant">
+                                                                <Image.Style>
+                                                                    <Style TargetType="Image">
+                                                                        <Style.Triggers>
+                                                                            <DataTrigger Binding="{Binding MidTankType}" Value="{x:Null}">
+                                                                                <Setter Property="Opacity" Value="0.2"></Setter>
+                                                                            </DataTrigger>
+                                                                        </Style.Triggers>
+                                                                    </Style>
+                                                                </Image.Style>
+                                                            </Image>
+                                                            <Rectangle IsHitTestVisible="False" Margin="4 25 4 1">
+                                                                <Rectangle.Fill>
+                                                                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,0.8" Opacity="0.8">
+                                                                        <GradientStop Offset="0" Color="Transparent" />
+                                                                        <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                                    </LinearGradientBrush>
+                                                                </Rectangle.Fill>
+                                                            </Rectangle>
+
+                                                            <TextBlock Text="{Binding IdsPackFormula.Name}" TextWrapping="Wrap" Height="30" IsHitTestVisible="False" Width="50" Margin="-20 15 0 0" FontSize="7" TextAlignment="Center" RenderTransformOrigin="0.5,0.5" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                                                <TextBlock.LayoutTransform>
+                                                                    <RotateTransform Angle="90" />
+                                                                </TextBlock.LayoutTransform>
+                                                            </TextBlock>
+                                                        </Grid>
+                                                    </UniformGrid>
+
+                                                    <Grid Grid.Row="1" Margin="3" IsHitTestVisible="False">
+                                                        <Grid.Style>
+                                                            <Style TargetType="Grid">
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding CartridgeType}" Value="{x:Null}">
+                                                                        <Setter Property="Opacity" Value="0.2"></Setter>
+                                                                    </DataTrigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </Grid.Style>
+                                                        <Border BorderBrush="#252525" BorderThickness="1" CornerRadius="3">
+                                                            <Border.Background>
+                                                                <LinearGradientBrush>
+                                                                    <GradientStop Color="#FF252525"/>
+                                                                    <GradientStop Color="#FF838383" Offset="1"/>
+                                                                </LinearGradientBrush>
+                                                            </Border.Background>
+                                                        </Border>
+                                                        <Border BorderBrush="#252525" BorderThickness="1" CornerRadius="3">
+                                                            <Border.Background>
+                                                                <LinearGradientBrush Opacity="0.7">
+                                                                    <GradientStop Offset="0" Color="Transparent" />
+                                                                    <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                                </LinearGradientBrush>
+                                                            </Border.Background>
+                                                        </Border>
+                                                    </Grid>
+                                                </Grid>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ListBox>
+
+                                    <Grid Margin="0 50 0 0">
+                                        <Grid.Style>
+                                            <Style TargetType="Grid">
+                                                <Setter Property="Visibility" Value="Hidden"></Setter>
+                                                <Style.Triggers>
+                                                    <DataTrigger Binding="{Binding ActiveMachine.Configuration.IdsPacks.Count}" Value="0">
+                                                        <Setter Property="Visibility" Value="Visible"></Setter>
+                                                    </DataTrigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </Grid.Style>
+                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold" Foreground="Gainsboro">NO IDS PACKS</TextBlock>
+                                    </Grid>
+
+                                    <Rectangle VerticalAlignment="Bottom" Stroke="DimGray" StrokeThickness="1">
+                                        <Rectangle.Effect>
+                                            <DropShadowEffect ShadowDepth="1" Opacity="1" Color="Black" />
+                                        </Rectangle.Effect>
+                                    </Rectangle>
+                                </Grid>
+
+                                <Grid x:Name="gridEmbedded" Style="{StaticResource draggableGrid}" Width="70" Height="100" Canvas.Left="80" Canvas.Top="331" IsHitTestVisible="True" SnapsToDevicePixels="True" dragAndDrop:DragAndDropService.Drop="OnEmbeddedDrop">
+                                    <Image Source="../Images/ti-tm4c129x.png" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                </Grid>
+
+                                <Grid Width="61" IsHitTestVisible="True" SnapsToDevicePixels="True" ClipToBounds="True" Height="42" Canvas.Left="85" Canvas.Top="385">
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Source="../Images/embedded.png" Width="10" VerticalAlignment="Center" Margin="1" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                        <TextBlock VerticalAlignment="Center" Padding="1" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding ActiveMachine.Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding ActiveMachine.Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
+                                    </StackPanel>
+                                </Grid>
+
+                                <TextBlock Canvas.Top="163" Canvas.Left="288" FontStyle="Italic" Foreground="Gray">Touch Panel</TextBlock>
+                                <Grid Width="53" Height="55" Canvas.Top="184" Canvas.Left="279">
+                                    <Rectangle Stroke="Gray" VerticalAlignment="Bottom" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                    <Rectangle Stroke="Gray" HorizontalAlignment="Right" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                </Grid>
+
+                                <TextBlock Canvas.Top="441" Canvas.Left="156" FontStyle="Italic" Foreground="Gray">Embedded Firmware</TextBlock>
+                                <Grid Width="82" Height="26" Canvas.Top="410" Canvas.Left="158">
+                                    <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                    <Rectangle Stroke="Gray" HorizontalAlignment="Right" StrokeThickness="1" StrokeDashArray="6" RenderTransformOrigin="0.5,0.5"/>
+                                </Grid>
+
+                                <TextBlock Canvas.Top="310" Canvas.Left="340" FontStyle="Italic" Foreground="Gray">Dispensers</TextBlock>
+                                <Grid Width="53" Height="20" Canvas.Top="331" Canvas.Left="377">
+                                    <Rectangle Stroke="Gray" VerticalAlignment="Bottom" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                    <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                </Grid>
+
+                                <TextBlock Canvas.Top="395" Canvas.Left="331" FontStyle="Italic" Foreground="Gray">Mid Tanks</TextBlock>
+                                <Grid Width="62" Height="29" Canvas.Top="418" Canvas.Left="357">
+                                    <Rectangle Stroke="Gray" VerticalAlignment="Bottom" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                    <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                </Grid>
+
+                                <TextBlock Canvas.Top="469" Canvas.Left="304" FontStyle="Italic" Foreground="Gray">Cartridges</TextBlock>
+                                <Grid Width="87" Height="10" Canvas.Top="487" Canvas.Left="332">
+                                    <Rectangle Stroke="Gray" VerticalAlignment="Bottom" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                    <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
+                                </Grid>
+
+                                <Grid x:Name="gridTablet" Width="67" IsHitTestVisible="True" SnapsToDevicePixels="True" ClipToBounds="True" Height="90" Canvas.Left="188" Canvas.Top="198" dragAndDrop:DragAndDropService.Drop="OnTabletDrop" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.DraggableBackground="#151515">
+                                    <Grid.Style>
+                                        <Style TargetType="Grid" BasedOn="{StaticResource draggableGrid}">
+                                            <Setter Property="Background" Value="#2B2B2B"></Setter>
+                                            <Style.Triggers>
+                                                <Trigger Property="dragAndDrop:DragAndDropService.IsDraggableOver" Value="True">
+                                                    <Setter Property="Background" Value="Black"></Setter>
+                                                </Trigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Grid.Style>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="1*" />
+                                        <RowDefinition Height="1*" />
+                                        <RowDefinition Height="1*" />
+                                    </Grid.RowDefinitions>
+
+                                    <StackPanel>
+                                        <Image Source="../Images/tablet.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                        <TextBlock Padding="2 0 2 0" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                                        <Run Text="{Binding ActiveMachine.Configuration.ApplicationDisplayPanelVersion.Name}"></Run>
+                                        <Run Text="{Binding ActiveMachine.Configuration.ApplicationDisplayPanelVersion.Version}"></Run>
+                                        </TextBlock>
+                                    </StackPanel>
+
+
+                                    <StackPanel Grid.Row="1" >
+                                        <Image Source="../Images/application-firmware.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                        <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                                        <Run Text="{Binding ActiveMachine.Configuration.ApplicationFirmwareVersion.Name}"></Run>
+                                        <Run Text="{Binding ActiveMachine.Configuration.ApplicationFirmwareVersion.Version}"></Run>
+                                        </TextBlock>
+                                    </StackPanel>
+
+                                    <StackPanel Grid.Row="2" >
+                                        <Image Source="../Images/android.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                        <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
+                                        <Run Text="{Binding ActiveMachine.Configuration.ApplicationOsVersion.Name}"></Run>
+                                        <Run Text="{Binding ActiveMachine.Configuration.ApplicationOsVersion.Version}"></Run>
+                                        </TextBlock>
+                                    </StackPanel>
+                                </Grid>
+                            </Canvas>
+                        </Grid>
+                    </Viewbox>
+                </Grid>
+
+
+                <Grid>
+                    <TextBlock Margin="10" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Top" Foreground="Gray" FontSize="16">IDS PACKS</TextBlock>
+                    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                        <ItemsControl ItemsSource="{Binding ActiveMachine.Configuration.IdsPacks}" FontSize="10" Foreground="DimGray" Margin="10 30 10 10">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel>
+                                        <TextBlock FontWeight="Bold" FontSize="12" Margin="5">
+                                            <Run>PACK: #</Run><Run Text="{Binding PackIndex}"></Run>
+                                        </TextBlock>
+                                        <StackPanel Margin="20 0 0 0">
+                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
+                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/injection.png" Width="12" VerticalAlignment="Center"></Image>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Dispenser:</Run> <Run FontStyle="Italic" Text="{Binding Dispenser.SerialNumber}"></Run></TextBlock>
+                                            </StackPanel>
+                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
+                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/tank.png" Width="12" VerticalAlignment="Center"></Image>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Mid Tank:</Run> <Run FontStyle="Italic" Text="{Binding MidTankType.Name}"></Run></TextBlock>
+                                            </StackPanel>
+                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
+                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/cartridge.png" Width="12" VerticalAlignment="Center"></Image>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Cartridge:</Run> <Run FontStyle="Italic" Text="{Binding CartridgeType.Name}"></Run></TextBlock>
+                                            </StackPanel>
+                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
+                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/liquid.png" Width="12" VerticalAlignment="Center"></Image>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Liquid:</Run> <Run FontStyle="Italic" Text="{Binding LiquidType.Name}"></Run></TextBlock>
+                                            </StackPanel>
+                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
+                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/formula.png" Width="12" VerticalAlignment="Center"></Image>
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Formula:</Run> <Run FontStyle="Italic" Text="{Binding IdsPackFormula.Name}"></Run></TextBlock>
+                                            </StackPanel>
+                                        </StackPanel>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
+                    </ScrollViewer>
+
+                    <Rectangle HorizontalAlignment="Right" Margin="0 20 0 20" Stroke="Gainsboro" StrokeThickness="1" StrokeDashArray="5 5 5 5"></Rectangle>
+                </Grid>
+            </Grid>
+
+            <Grid Grid.Column="1" IsEnabled="{Binding CanWork}">
+                <Grid.RowDefinitions>
+                    <RowDefinition/>
+                    <RowDefinition Height="80"/>
+                </Grid.RowDefinitions>
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                    <Grid>
+                        <StackPanel>
+                            <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
+                                <StackPanel>
+                                    <Expander HorizontalAlignment="Stretch" Header="Dispensers">
+                                        <StackPanel>
+                                            <DockPanel>
+                                                <materialDesign:PackIcon Width="24" Height="24" Kind="BarcodeScan" VerticalAlignment="Center" />
+                                                <TextBox Margin="5 0 0 0" materialDesign:HintAssist.Hint="Serial Number" Text="{Binding DispensersFilter,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                                            </DockPanel>
+                                            <ListBox Margin="0 10 0 20" ItemsSource="{Binding ActiveMachineAdapter.Dispensers}" HorizontalContentAlignment="Stretch" Height="200">
+                                                <ListBox.ItemContainerStyle>
+                                                    <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                        <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                                        <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                        <Setter Property="Padding" Value="1"></Setter>
+                                                    </Style>
+                                                </ListBox.ItemContainerStyle>
+                                                <ListBox.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                                            <StackPanel Orientation="Horizontal" Margin="2 8">
+                                                                <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/injection.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                                <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
+                                                                    <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding SerialNumber}"></Run></TextBlock>
+                                                                </StackPanel>
+                                                            </StackPanel>
+
+                                                            <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                        </Grid>
+                                                    </DataTemplate>
+                                                </ListBox.ItemTemplate>
+                                            </ListBox>
+                                        </StackPanel>
+                                    </Expander>
+                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
+                                    <Expander HorizontalAlignment="Stretch" Header="Mid Tanks">
+                                        <ListBox ItemsSource="{Binding ActiveMachineAdapter.MidTankTypes}" HorizontalContentAlignment="Stretch">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="Padding" Value="1"></Setter>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
+                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/tank.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                            </StackPanel>
+                                                        </StackPanel>
+
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </Expander>
+                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
+                                    <Expander HorizontalAlignment="Stretch" Header="Cartridges">
+                                        <ListBox ItemsSource="{Binding ActiveMachineAdapter.CartridgeTypes}" HorizontalContentAlignment="Stretch">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="Padding" Value="1"></Setter>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
+                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/cartridge.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                            </StackPanel>
+                                                        </StackPanel>
+
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </Expander>
+                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
+                                    <Expander HorizontalAlignment="Stretch" Header="Liquids">
+                                        <ListBox ItemsSource="{Binding ActiveMachineAdapter.LiquidTypes}" HorizontalContentAlignment="Stretch">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="Padding" Value="1"></Setter>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
+                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/liquid.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                                <Rectangle Height="5" Width="170">
+                                                                    <Rectangle.Fill>
+                                                                        <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                                                    </Rectangle.Fill>
+                                                                </Rectangle>
+                                                            </StackPanel>
+                                                        </StackPanel>
+
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </Expander>
+                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
+                                    <Expander HorizontalAlignment="Stretch" Header="IDS Pack Formulas">
+                                        <ListBox ItemsSource="{Binding ActiveMachineAdapter.IdsPackFormulas}" HorizontalContentAlignment="Stretch">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="Padding" Value="1"></Setter>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
+                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/formula.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                            </StackPanel>
+                                                        </StackPanel>
+
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </Expander>
+                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
+                                    <Expander HorizontalAlignment="Stretch" Header="Touch Panels">
+                                        <ListBox ItemsSource="{Binding ActiveMachineAdapter.ApplicationDisplayPanelVersions}" HorizontalContentAlignment="Stretch">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="Padding" Value="1"></Setter>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
+                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/tablet.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                            </StackPanel>
+                                                        </StackPanel>
+
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </Expander>
+                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
+                                    <Expander HorizontalAlignment="Stretch" Header="Operation Systems">
+                                        <ListBox ItemsSource="{Binding ActiveMachineAdapter.ApplicationOsVersions}" HorizontalContentAlignment="Stretch">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="Padding" Value="1"></Setter>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
+                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/android.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                            </StackPanel>
+                                                        </StackPanel>
+
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </Expander>
+                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
+                                    <Expander HorizontalAlignment="Stretch" Header="Application Firmwares">
+                                        <ListBox ItemsSource="{Binding ActiveMachineAdapter.ApplicationFirmwareVersions}" HorizontalContentAlignment="Stretch">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="Padding" Value="1"></Setter>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
+                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/application-firmware.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                            </StackPanel>
+                                                        </StackPanel>
+
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </Expander>
+                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
+                                    <Expander HorizontalAlignment="Stretch" Header="Embedded Firmwares">
+                                        <ListBox ItemsSource="{Binding ActiveMachineAdapter.EmbeddedFirmwareVersions}" HorizontalContentAlignment="Stretch">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="Padding" Value="1"></Setter>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
+                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/embedded.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                            </StackPanel>
+                                                        </StackPanel>
+
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </Expander>
+                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
+                                    <Expander HorizontalAlignment="Stretch" Header="Hardware Versions">
+                                        <ListBox ItemsSource="{Binding ActiveMachineAdapter.HardwareVersions}" HorizontalContentAlignment="Stretch">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
+                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
+                                                    <Setter Property="Padding" Value="1"></Setter>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
+                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/hardware.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
+                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
+                                                            </StackPanel>
+                                                        </StackPanel>
+
+                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </Expander>
+                                </StackPanel>
+                            </materialDesign:Card>
+                        </StackPanel>
+                    </Grid>
+                </ScrollViewer>
+            </Grid>
+        </Grid>
+
+        <dragAndDrop:DraggingSurface x:Name="dragSufrace" />
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml.cs
new file mode 100644
index 000000000..941a2792d
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/ConfigurationView.xaml.cs
@@ -0,0 +1,172 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.BL.Entities;
+using Tango.DragAndDrop;
+using Tango.MachineStudio.MachineDesigner.ViewModels;
+
+namespace Tango.MachineStudio.MachineDesigner.Views
+{
+    /// <summary>
+    /// Interaction logic for MainView.xaml
+    /// </summary>
+    public partial class ConfigurationView : UserControl
+    {
+        private MainViewVM _vm;
+        private Rectangle _highlightRect;
+        private bool _highlightShown;
+        private DoubleAnimation _highlightAnimation;
+
+        public ColumnDefinition PanelColumnDefinition { get; set; }
+
+        public ConfigurationView()
+        {
+            InitializeComponent();
+
+            PanelColumnDefinition = panelColumnDefinition;
+
+            DraggingSurface = dragSufrace;
+            this.Loaded += (x, y) =>
+            {
+                _vm = DataContext as MainViewVM;
+            };
+
+            DragAndDropService.DragStarted += DragAndDropService_DragStarted;
+            DragAndDropService.DragEnded += DragAndDropService_DragEnded;
+
+            _highlightRect = new Rectangle();
+            _highlightRect.IsHitTestVisible = false;
+            _highlightRect.Stroke = Application.Current.Resources["AccentColorBrush"] as Brush;
+            _highlightRect.StrokeThickness = 2;
+            _highlightRect.StrokeDashArray = new DoubleCollection(new double[] { 3, 3, 3, 3 });
+        }
+
+        private void DragAndDropService_DragEnded(object sender, FrameworkElement e)
+        {
+            canvas.Children.Remove(_highlightRect);
+            _highlightShown = false;
+            _highlightRect.BeginAnimation(Rectangle.OpacityProperty, null);
+        }
+
+        private void DragAndDropService_DragStarted(object sender, FrameworkElement e)
+        {
+            if (e.DataContext is HardwareVersion)
+            {
+                SetHighlightRegion(hardwareGrid);
+            }
+            else if (e.DataContext is ApplicationOsVersion || e.DataContext is ApplicationDisplayPanelVersion || e.DataContext is ApplicationFirmwareVersion)
+            {
+                SetHighlightRegion(gridTablet);
+            }
+            else if (e.DataContext is EmbeddedFirmwareVersion)
+            {
+                SetHighlightRegion(gridEmbedded);
+            }
+            else if (e.DataContext is DispenserType || e.DataContext is CartridgeType || e.DataContext is LiquidType || e.DataContext is MidTankType || e.DataContext is IdsPackFormula)
+            {
+                SetHighlightRegion(gridIds);
+            }
+        }
+
+        public DraggingSurface DraggingSurface
+        {
+            get { return (DraggingSurface)GetValue(DraggingSurfaceProperty); }
+            set { SetValue(DraggingSurfaceProperty, value); }
+        }
+        public static readonly DependencyProperty DraggingSurfaceProperty =
+            DependencyProperty.Register("DraggingSurface", typeof(DraggingSurface), typeof(MainView), new PropertyMetadata(null));
+
+        private void OnDropOnIdsPack(object sender, DropEventArgs e)
+        {
+            if (e.Draggable.DataContext is Dispenser)
+            {
+                _vm.DropDispenser(e.Draggable.DataContext as Dispenser, e.Droppable.DataContext as IdsPack);
+            }
+            else if (e.Draggable.DataContext is LiquidType)
+            {
+                _vm.DropLiquidType(e.Draggable.DataContext as LiquidType, e.Droppable.DataContext as IdsPack);
+            }
+            else if (e.Draggable.DataContext is CartridgeType)
+            {
+                _vm.DropCartridgeType(e.Draggable.DataContext as CartridgeType, e.Droppable.DataContext as IdsPack);
+            }
+            else if (e.Draggable.DataContext is MidTankType)
+            {
+                _vm.DropMidTankType(e.Draggable.DataContext as MidTankType, e.Droppable.DataContext as IdsPack);
+            }
+            else if (e.Draggable.DataContext is IdsPackFormula)
+            {
+                _vm.DropIdsFormula(e.Draggable.DataContext as IdsPackFormula, e.Droppable.DataContext as IdsPack);
+            }
+            else if (e.Draggable.DataContext is IdsPack)
+            {
+                _vm.DropIdsPack(e.Draggable.DataContext as IdsPack, e.Droppable.DataContext as IdsPack);
+            }
+        }
+
+        private void OnTabletDrop(object sender, DropEventArgs e)
+        {
+            if (e.Draggable.DataContext is ApplicationDisplayPanelVersion)
+            {
+                _vm.DropTouchPanel(e.Draggable.DataContext as ApplicationDisplayPanelVersion);
+            }
+            else if (e.Draggable.DataContext is ApplicationOsVersion)
+            {
+                _vm.DropApplicationOsVersion(e.Draggable.DataContext as ApplicationOsVersion);
+            }
+            else if (e.Draggable.DataContext is ApplicationFirmwareVersion)
+            {
+                _vm.DropApplicationFirmwareVersion(e.Draggable.DataContext as ApplicationFirmwareVersion);
+            }
+        }
+
+        private void OnEmbeddedDrop(object sender, DropEventArgs e)
+        {
+            if (e.Draggable.DataContext is EmbeddedFirmwareVersion)
+            {
+                _vm.DropEmbeddedFirmware(e.Draggable.DataContext as EmbeddedFirmwareVersion);
+            }
+        }
+
+        private void MachineDrop(object sender, DropEventArgs e)
+        {
+            if (e.Draggable.DataContext is HardwareVersion)
+            {
+                _vm.DropHardwareVersion(e.Draggable.DataContext as HardwareVersion);
+            }
+        }
+
+        private void SetHighlightRegion(FrameworkElement element)
+        {
+            if (!_highlightShown)
+            {
+                _highlightRect.Width = element.Width;
+                _highlightRect.Height = element.Height;
+                Canvas.SetLeft(_highlightRect, Canvas.GetLeft(element));
+                Canvas.SetTop(_highlightRect, Canvas.GetTop(element));
+                canvas.Children.Add(_highlightRect);
+                _highlightShown = true;
+                _highlightAnimation = new DoubleAnimation();
+                _highlightAnimation.From = 0;
+                _highlightAnimation.To = 1;
+                _highlightAnimation.Duration = TimeSpan.FromSeconds(0.2);
+                _highlightAnimation.AutoReverse = true;
+                _highlightAnimation.RepeatBehavior = RepeatBehavior.Forever;
+                _highlightRect.BeginAnimation(Rectangle.OpacityProperty, _highlightAnimation);
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
new file mode 100644
index 000000000..e3ba1bff4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml
@@ -0,0 +1,46 @@
+<UserControl x:Class="Tango.MachineStudio.MachineDesigner.Views.MachineCreationDialog"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
+             xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="400" d:DesignWidth="700" Height="400" Width="700" Background="White" d:DataContext="{d:DesignInstance Type=vm:MachineCreationDialogVM, IsDesignTimeCreatable=False}">
+    <Grid Margin="10">
+        <DockPanel>
+            <Grid DockPanel.Dock="Top">
+                <StackPanel Orientation="Horizontal">
+                    <Grid>
+                        <Image Source="../Images/machine-full-fx.png" Width="120" RenderOptions.BitmapScalingMode="Fant"></Image>
+                        <materialDesign:PackIcon HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -10 -10" Kind="PlusCircle" Foreground="#15C315" Width="42" Height="42" />
+                    </Grid>
+                    <TextBlock Margin="30 0 0 0" VerticalAlignment="Bottom" FontSize="22">NEW MACHINE</TextBlock>
+                </StackPanel>
+            </Grid>
+
+            <Grid DockPanel.Dock="Bottom">
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Right" DockPanel.Dock="Bottom">
+                    <Button Command="{Binding CloseCommand}" Width="140" Height="40" Margin="0 0 10 0">
+                        CANCEL
+                    </Button>
+                    <Button Command="{Binding OKCommand}" IsDefault="True" Width="140" Height="40">
+                        CREATE
+                    </Button>
+                </StackPanel>
+            </Grid>
+
+            <Grid>
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="400">
+                    <TextBlock TextWrapping="Wrap" TextAlignment="Center">
+                        <Run>Please specify the machine version in order to prototype the new machine with default machine settings and configuartion.</Run>
+                    </TextBlock>
+
+                    <ComboBox ItemsSource="{Binding MachineVersions}" SelectedItem="{Binding SelectedMachineVersion}" DisplayMemberPath="Name" Margin="0 10 0 0" FontSize="16" materialDesign:HintAssist.Hint="NONE"></ComboBox>
+                </StackPanel>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml.cs
new file mode 100644
index 000000000..3901309a9
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineCreationDialog.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.MachineDesigner.Views
+{
+    /// <summary>
+    /// Interaction logic for MachineCreationDialog.xaml
+    /// </summary>
+    public partial class MachineCreationDialog : UserControl
+    {
+        public MachineCreationDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
new file mode 100644
index 000000000..31e7f535b
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml
@@ -0,0 +1,59 @@
+<UserControl x:Class="Tango.MachineStudio.MachineDesigner.Views.MachineDetailsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
+             xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
+              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+    <Grid Margin="20">
+        <DockPanel>
+            <Grid DockPanel.Dock="Top">
+                <StackPanel Orientation="Horizontal">
+                    <Button Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Command="{Binding BackToMachinesCommand}">
+                        <materialDesign:PackIcon Kind="ArrowLeft" Width="50" Height="50" Foreground="#202020" ToolTip="Back to RML list" />
+                    </Button>
+                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="34" Text="{Binding ActiveMachine.Name}">
+
+                    </TextBlock>
+                </StackPanel>
+
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 20 0">
+                    <Button  Width="170" Height="45"  VerticalAlignment="Center" Command="{Binding SaveCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
+                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+            </Grid>
+
+            <Grid DockPanel.Dock="Bottom">
+
+            </Grid>
+
+            <Grid IsEnabled="{Binding IsFree}">
+                <TabControl Background="Transparent">
+                    <TabControl.Resources>
+                        <Style TargetType="TabPanel">
+                            <Setter Property="HorizontalAlignment" Value="Center"/>
+                        </Style>
+                    </TabControl.Resources>
+                    <TabItem Header="SETTINGS">
+                        <local:MachineSettingsView/>
+                    </TabItem>
+                    <TabItem Header="CONFIGURATION">
+                        <local:ConfigurationView/>
+                    </TabItem>
+                    <TabItem Header="SPOOLS">
+                        <local:SpoolsView/>
+                    </TabItem>
+                </TabControl>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml.cs
new file mode 100644
index 000000000..07d012966
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineDetailsView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.MachineDesigner.Views
+{
+    /// <summary>
+    /// Interaction logic for MachineDetailsView.xaml
+    /// </summary>
+    public partial class MachineDetailsView : UserControl
+    {
+        public MachineDetailsView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
new file mode 100644
index 000000000..afd52f38d
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -0,0 +1,99 @@
+<UserControl x:Class="Tango.MachineStudio.MachineDesigner.Views.MachineSettingsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
+             xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
+             xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+    <Grid Margin="20">
+        <DockPanel>
+            <Grid DockPanel.Dock="Bottom">
+
+            </Grid>
+
+            <Grid Margin="0 20">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="111*"/>
+                    <ColumnDefinition Width="124*"/>
+                </Grid.ColumnDefinitions>
+
+                <local:MachineView DataContext="{Binding ActiveMachine}" IsHitTestVisible="False" />
+
+                <Border Grid.Column="1" Margin="100 140" CornerRadius="5" Background="#68F6F6F6" Padding="10" BorderBrush="Silver" BorderThickness="1">
+                    <Grid TextElement.Foreground="#3E3E3E">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <controls:TableGrid RowHeight="50" Margin="10">
+                            <TextBlock FontWeight="SemiBold">Serial Number</TextBlock>
+                            <TextBox Text="{Binding ActiveMachine.SerialNumber}"></TextBox>
+
+                            <TextBlock FontWeight="SemiBold">Name</TextBlock>
+                            <TextBox Text="{Binding ActiveMachine.Name}"></TextBox>
+
+                            <TextBlock FontWeight="SemiBold">Machine Version</TextBlock>
+                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.MachineVersions}" SelectedItem="{Binding ActiveMachine.MachineVersion}" DisplayMemberPath="Name"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">Organization</TextBlock>
+                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">Default RML</TextBlock>
+                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedItem="{Binding ActiveMachine.DefaultRml}" DisplayMemberPath="Name"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">Loaded RML</TextBlock>
+                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.Rmls}" SelectedValue="{Binding ActiveMachine.LoadedRmlGuid}" SelectedValuePath="Guid" DisplayMemberPath="Name"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">Default Color Space</TextBlock>
+                            <ComboBox Background="#F4F4F4" ItemsSource="{Binding ActiveMachineAdapter.ColorSpaces}" SelectedItem="{Binding ActiveMachine.DefaultColorSpace}" DisplayMemberPath="Name"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">Default Segment Length</TextBlock>
+                            <mahapps:NumericUpDown HideUpDownButtons="True" BorderThickness="0 0 0 1" Background="Transparent" Minimum="0" Maximum="1000" Value="{Binding ActiveMachine.DefaultSegmentLength}" HasDecimals="False"></mahapps:NumericUpDown>
+
+                            <TextBlock FontWeight="SemiBold">Default Spool Type</TextBlock>
+                            <ComboBox ItemsSource="{Binding ActiveMachineAdapter.SpoolTypes}" SelectedItem="{Binding ActiveMachine.DefaultSpoolType}" DisplayMemberPath="Name"></ComboBox>
+
+                            <TextBlock FontWeight="SemiBold">OS Key</TextBlock>
+                            <TextBox Text="{Binding ActiveMachine.OsKey}"></TextBox>
+                        </controls:TableGrid>
+                        <Rectangle Grid.Column="1" StrokeThickness="1" Stroke="Silver" HorizontalAlignment="Center" Margin="50 50" />
+                        <controls:TableGrid RowHeight="50" Margin="10" Grid.Column="2">
+                            <TextBlock FontWeight="SemiBold">Auto Login</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoLogin}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Auto Check For Updates</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.AutoCheckForUpdates}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Setup Activation</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupActivation}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Setup Remote Assistance</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupRemoteAssistance}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Setup UWF</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupUwf}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Setup Firmware</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupFirmware}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Setup FPGA</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.SetupFpga}"></ToggleButton>
+
+                            <TextBlock FontWeight="SemiBold">Is Demo Machine</TextBlock>
+                            <ToggleButton HorizontalAlignment="Left" IsChecked="{Binding ActiveMachine.IsDemo}"></ToggleButton>
+                        </controls:TableGrid>
+                    </Grid>
+                </Border>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml.cs
new file mode 100644
index 000000000..29367c3c4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.MachineDesigner.Views
+{
+    /// <summary>
+    /// Interaction logic for MachineDetailsView.xaml
+    /// </summary>
+    public partial class MachineSettingsView : UserControl
+    {
+        public MachineSettingsView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
index 1ea8d2a74..d6afd41bf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineView.xaml
@@ -69,25 +69,6 @@
                         <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
                     </Grid>
 
-                    <TextBlock Canvas.Top="222" Canvas.Left="446" FontStyle="Italic" Foreground="Gray">Add IDS</TextBlock>
-                    <Grid Width="23" Height="20" Canvas.Top="231" Canvas.Left="414">
-                        <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                        <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                    </Grid>
-
-                    <TextBlock Canvas.Top="255" Canvas.Left="500" FontStyle="Italic" Foreground="Gray">Remove IDS</TextBlock>
-                    <Grid Width="35" Height="8" Canvas.Top="264" Canvas.Left="460">
-                        <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                    </Grid>
-
-                    <Button Style="{StaticResource MaterialDesignFlatButton}" Height="24" Width="24" Padding="0" Canvas.Left="402" Canvas.Top="253">
-                        <materialDesign:PackIcon Kind="Plus" Width="24" Height="24"></materialDesign:PackIcon>
-                    </Button>
-
-                    <Button Style="{StaticResource MaterialDesignFlatButton}" Height="24" Width="24" Padding="0" Canvas.Left="430" Canvas.Top="252">
-                        <materialDesign:PackIcon Kind="Minus" Width="24" Height="24"></materialDesign:PackIcon>
-                    </Button>
-
                     <UniformGrid Width="310" Canvas.Top="295" Canvas.Left="420" Rows="1" Columns="8" TextElement.FontSize="9">
                         <TextBlock HorizontalAlignment="Center">1</TextBlock>
                         <TextBlock HorizontalAlignment="Center">2</TextBlock>
@@ -133,7 +114,7 @@
                                                     <Image.Style>
                                                         <Style TargetType="Image">
                                                             <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding DispenserType}" Value="{x:Null}">
+                                                                <DataTrigger Binding="{Binding Dispenser}" Value="{x:Null}">
                                                                     <Setter Property="Opacity" Value="0.2"></Setter>
                                                                 </DataTrigger>
                                                             </Style.Triggers>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
new file mode 100644
index 000000000..c6587b564
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml
@@ -0,0 +1,82 @@
+<UserControl x:Class="Tango.MachineStudio.MachineDesigner.Views.MachinesView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
+             xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
+             xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
+             xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+    <UserControl.Resources>
+        <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
+    </UserControl.Resources>
+
+    <Grid>
+        <DockPanel Margin="100" MaxWidth="1200">
+            <Grid DockPanel.Dock="Top">
+                <StackPanel Orientation="Horizontal">
+                    <Image  Source="../Images/machine-full-fx.png" Width="350" RenderOptions.BitmapScalingMode="Fant" Margin="10" />
+
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0 0 0 10">
+                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="BarcodeScan" Width="32" Height="32" />
+                        <TextBox Width="400" FontSize="20" Margin="10 0 0 0" materialDesign:HintAssist.Hint="Serial Number" Text="{Binding Filter,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+            <Grid DockPanel.Dock="Bottom" IsEnabled="{Binding IsFree}">
+                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveMachineCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
+                            <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
+                        </StackPanel>
+                    </Button>
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FFA65F" BorderBrush="#FFA65F" Command="{Binding CloneMachineCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="ContentCopy" Width="20" Height="20" />
+                            <TextBlock Margin="5 0 0 0" FontSize="16">CLONE</TextBlock>
+                        </StackPanel>
+                    </Button>
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddMachineCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
+                            <TextBlock Margin="5 0 0 0" FontSize="16">NEW MACHINE</TextBlock>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Margin="50 0 0 0" MinWidth="200" Height="60" Command="{Binding EditMachineCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Pencil" Width="24" Height="24" />
+                            <TextBlock Margin="10 0 0 0" FontSize="18">EDIT</TextBlock>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+            </Grid>
+            <Grid IsEnabled="{Binding IsFree}">
+                <DataGrid Margin="0 0 0 10" SelectionMode="Single" SelectionUnit="FullRow" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding MachinesAdapter.Machines}" SelectedItem="{Binding SelectedMachine}">
+                    <DataGrid.CellStyle>
+                        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                            <Setter Property="BorderThickness" Value="0"/>
+                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                        </Style>
+                    </DataGrid.CellStyle>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Header="SERIAL NUMBER" Binding="{Binding SerialNumber}" Width="Auto" />
+                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
+                        <DataGridTextColumn Header="ORGANIZATION" Binding="{Binding Organization.Name}" Width="Auto" />
+                        <DataGridTextColumn Header="VERSION" Binding="{Binding MachineVersion.Name}" Width="Auto" />
+                        <DataGridTextColumn Header="DEMO MACHINE" Binding="{Binding IsDemo}" Width="Auto" />
+                        <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml.cs
new file mode 100644
index 000000000..776a922ca
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachinesView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.MachineDesigner.Views
+{
+    /// <summary>
+    /// Interaction logic for MachinesView.xaml
+    /// </summary>
+    public partial class MachinesView : UserControl
+    {
+        public MachinesView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
index e25a64c5e..bc9b038dc 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml
@@ -3,812 +3,16 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:dragAndDrop="clr-namespace:Tango.DragAndDrop;assembly=Tango.DragAndDrop"
+             xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
              xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
-             xmlns:fa="http://schemas.fontawesome.io/icons/"
-             xmlns:providers="clr-namespace:Tango.MachineStudio.MachineDesigner.AutoComplete"
-             xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
-             xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              mc:Ignorable="d" 
-             d:DesignHeight="720" d:DesignWidth="1280" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
-
-    <UserControl.Resources>
-        <sharedConverters:ColorToIntegerConverter x:Key="ColorToIntegerConverter" />
-
-        <Style x:Key="draggableGrid" TargetType="Grid">
-            <Setter Property="RenderTransform">
-                <Setter.Value>
-                    <ScaleTransform ScaleX="1" ScaleY="1"></ScaleTransform>
-                </Setter.Value>
-            </Setter>
-            <Setter Property="RenderTransformOrigin" Value="0.5,0.5"></Setter>
-            <Setter Property="Background" Value="Transparent"></Setter>
-            <Setter Property="dragAndDrop:DragAndDropService.Draggable" Value="True"></Setter>
-            <Setter Property="dragAndDrop:DragAndDropService.Droppable" Value="True"></Setter>
-            <Setter Property="dragAndDrop:DragAndDropService.DraggingSurface" Value="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}"></Setter>
-            <Style.Triggers>
-                <Trigger Property="dragAndDrop:DragAndDropService.IsDraggableOver" Value="True">
-                    <Setter Property="Opacity" Value="0.5"></Setter>
-                    <Trigger.EnterActions>
-                        <BeginStoryboard>
-                            <Storyboard>
-                                <DoubleAnimation To="0.95" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleX"></DoubleAnimation>
-                                <DoubleAnimation To="0.95" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleY"></DoubleAnimation>
-                            </Storyboard>
-                        </BeginStoryboard>
-                    </Trigger.EnterActions>
-                    <Trigger.ExitActions>
-                        <BeginStoryboard>
-                            <Storyboard>
-                                <DoubleAnimation To="1" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleX"></DoubleAnimation>
-                                <DoubleAnimation To="1" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleY"></DoubleAnimation>
-                            </Storyboard>
-                        </BeginStoryboard>
-                    </Trigger.ExitActions>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
-
-        <Style TargetType="Expander" BasedOn="{StaticResource {x:Type Expander}}">
-            <Setter Property="HeaderTemplate">
-                <Setter.Value>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding}" FontSize="13"></TextBlock>
-                    </DataTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </UserControl.Resources>
-
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <Grid>
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="477*"/>
-                <ColumnDefinition Width="310" x:FieldModifier="public" x:Name="panelColumnDefinition" />
-            </Grid.ColumnDefinitions>
-
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="200"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-
-                <Grid Grid.Column="1">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="90"/>
-                        <RowDefinition Height="631*"/>
-                    </Grid.RowDefinitions>
-
-                    <Grid ClipToBounds="False">
-                        <StackPanel>
-                            <StackPanel Orientation="Horizontal" x:Name="stackHeader" x:FieldModifier="public">
-                                <TextBlock FontSize="30" FontStyle="Italic" VerticalAlignment="Center" Margin="50 10 10 0" Foreground="Silver" FontWeight="Bold">MACHINE DESIGNER</TextBlock>
-                                <StackPanel Orientation="Horizontal" Margin="20 10 0 0" VerticalAlignment="Center">
-                                    <materialDesign:PackIcon Kind="BarcodeScan" VerticalAlignment="Bottom" Width="24" Height="24" Foreground="Silver"></materialDesign:PackIcon>
-                                    <autoComplete:AutoCompleteTextBox FontSize="16" FontWeight="Bold" FontStyle="Italic" Width="300" Margin="5 0 0 0" materialDesign:HintAssist.Hint="Enter serial number" DisplayMember="SerialNumber" Provider="{Binding MachinesProvider}" SelectedItem="{Binding SelectedMachine,Mode=TwoWay}">
-                                        <autoComplete:AutoCompleteTextBox.ItemTemplate>
-                                            <DataTemplate>
-                                                <TextBlock Text="{Binding SerialNumber}"></TextBlock>
-                                            </DataTemplate>
-                                        </autoComplete:AutoCompleteTextBox.ItemTemplate>
-                                        <autoComplete:AutoCompleteTextBox.LoadingContent>
-                                            <TextBlock Text="Loading..." Margin="5" FontSize="14" />
-                                        </autoComplete:AutoCompleteTextBox.LoadingContent>
-                                    </autoComplete:AutoCompleteTextBox>
-
-                                    <Button Style="{StaticResource MaterialDesignFlatButton}" Margin="10 0 0 0" Padding="0" Foreground="Gray" Width="40" Command="{Binding ResetCommand}" ToolTip="Reset the designer">
-                                        <materialDesign:PackIcon Kind="Refresh" Width="24" Height="24" />
-                                    </Button>
-                                </StackPanel>
-                            </StackPanel>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0 0 50 0">
-
-                        </StackPanel>
-                    </Grid>
-
-                    <Viewbox MaxWidth="1200" Grid.Row="1" >
-                        <Grid VerticalAlignment="Top">
-
-                            <Image IsHitTestVisible="False" Source="../Images/machine-full-fx.png" MaxWidth="800" RenderOptions.BitmapScalingMode="Fant">
-                                <Image.Effect>
-                                    <DropShadowEffect ShadowDepth="0" BlurRadius="20" Opacity="1" RenderingBias="Performance" Color="DimGray"></DropShadowEffect>
-                                </Image.Effect>
-                            </Image>
-
-                            <Canvas ClipToBounds="False" x:Name="canvas">
-
-                                <Grid x:Name="hardwareGrid" Style="{StaticResource draggableGrid}" Width="118" Height="27" Canvas.Left="342" Canvas.Top="80" Background="#6B303030" IsHitTestVisible="True" dragAndDrop:DragAndDropService.Drop="MachineDrop">
-                                    <Border BorderBrush="#6C6C6C" BorderThickness="1" IsHitTestVisible="False">
-                                        <StackPanel Orientation="Horizontal">
-                                            <Image Source="../Images/hardware.png" Width="10" VerticalAlignment="Center" Margin="5" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                            <TextBlock Padding="2 0 2 0" VerticalAlignment="Center" TextAlignment="Center" Foreground="Gainsboro" IsHitTestVisible="False" FontSize="6" TextWrapping="Wrap">
-                                            <Run Text="{Binding Configuration.HardwareVersion.Name}"></Run>
-                                            <Run Text="{Binding Configuration.HardwareVersion.Version}"></Run>
-                                            </TextBlock>
-                                        </StackPanel>
-                                    </Border>
-                                </Grid>
-
-                                <TextBlock Canvas.Left="532" FontStyle="Italic" Foreground="Gray" Canvas.Top="-22">Hardware Version</TextBlock>
-                                <Grid Width="97" Height="90" Canvas.Left="431" Canvas.Top="-13">
-                                    <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                    <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                </Grid>
-
-                                <TextBlock Canvas.Top="222" Canvas.Left="446" FontStyle="Italic" Foreground="Gray">Add IDS</TextBlock>
-                                <Grid Width="23" Height="20" Canvas.Top="231" Canvas.Left="414">
-                                    <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                    <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                </Grid>
-
-                                <TextBlock Canvas.Top="255" Canvas.Left="500" FontStyle="Italic" Foreground="Gray">Remove IDS</TextBlock>
-                                <Grid Width="35" Height="8" Canvas.Top="264" Canvas.Left="460">
-                                    <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                </Grid>
-
-                                <Button Command="{Binding AddIdsCommand}" Style="{StaticResource MaterialDesignFlatButton}" Height="24" Width="24" Padding="0" Canvas.Left="402" Canvas.Top="253">
-                                    <materialDesign:PackIcon Kind="Plus" Width="24" Height="24"></materialDesign:PackIcon>
-                                </Button>
-
-                                <Button Command="{Binding RemoveIdsCommand}" Style="{StaticResource MaterialDesignFlatButton}" Height="24" Width="24" Padding="0" Canvas.Left="430" Canvas.Top="252">
-                                    <materialDesign:PackIcon Kind="Minus" Width="24" Height="24"></materialDesign:PackIcon>
-                                </Button>
-
-                                <UniformGrid Width="310" Canvas.Top="295" Canvas.Left="420" Rows="1" Columns="8" TextElement.FontSize="9">
-                                    <TextBlock HorizontalAlignment="Center">1</TextBlock>
-                                    <TextBlock HorizontalAlignment="Center">2</TextBlock>
-                                    <TextBlock HorizontalAlignment="Center">3</TextBlock>
-                                    <TextBlock HorizontalAlignment="Center">4</TextBlock>
-                                    <TextBlock HorizontalAlignment="Center">5</TextBlock>
-                                    <TextBlock HorizontalAlignment="Center">6</TextBlock>
-                                    <TextBlock HorizontalAlignment="Center">7</TextBlock>
-                                    <TextBlock HorizontalAlignment="Center">8</TextBlock>
-                                </UniformGrid>
-                                <Grid x:Name="gridIds" Width="310" Height="195" Canvas.Top="314" Canvas.Left="420">
-                                    <ListBox ItemsSource="{Binding Configuration.IdsPacks}" SelectedItem="{Binding SelectedIds}" ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-                                        <ListBox.ItemContainerStyle>
-                                            <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                <Setter Property="Padding" Value="0"></Setter>
-                                                <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                            </Style>
-                                        </ListBox.ItemContainerStyle>
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <UniformGrid Columns="8"></UniformGrid>
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-                                        <ItemsControl.ItemTemplate>
-                                            <DataTemplate>
-                                                <Grid dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Drop="OnDropOnIdsPack">
-                                                    <Grid.RowDefinitions>
-                                                        <RowDefinition Height="1*"/>
-                                                        <RowDefinition Height="30"/>
-                                                    </Grid.RowDefinitions>
-                                                    <Grid.Style>
-                                                        <Style TargetType="Grid" BasedOn="{StaticResource draggableGrid}">
-                                                            <Style.Triggers>
-
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Grid.Style>
-                                                    <UniformGrid Columns="1" Rows="2">
-                                                        <Grid Margin="2">
-                                                            <Image IsHitTestVisible="False" Source="../Images/dispenser.png" RenderOptions.BitmapScalingMode="Fant">
-                                                                <Image.Style>
-                                                                    <Style TargetType="Image">
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding DispenserType}" Value="{x:Null}">
-                                                                                <Setter Property="Opacity" Value="0.2"></Setter>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </Image.Style>
-                                                            </Image>
-                                                            <Rectangle IsHitTestVisible="False" Margin="14 25 13 34">
-                                                                <Rectangle.Fill>
-                                                                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,0.8" Opacity="0.8">
-                                                                        <GradientStop Offset="0" Color="Transparent" />
-                                                                        <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
-                                                                    </LinearGradientBrush>
-                                                                </Rectangle.Fill>
-                                                            </Rectangle>
-                                                        </Grid>
-
-                                                        <Grid Margin="2">
-                                                            <Image IsHitTestVisible="False" Stretch="Fill" Source="../Images/mid-tank.png" RenderOptions.BitmapScalingMode="Fant">
-                                                                <Image.Style>
-                                                                    <Style TargetType="Image">
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding MidTankType}" Value="{x:Null}">
-                                                                                <Setter Property="Opacity" Value="0.2"></Setter>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </Image.Style>
-                                                            </Image>
-                                                            <Rectangle IsHitTestVisible="False" Margin="4 25 4 1">
-                                                                <Rectangle.Fill>
-                                                                    <LinearGradientBrush StartPoint="0,0" EndPoint="0,0.8" Opacity="0.8">
-                                                                        <GradientStop Offset="0" Color="Transparent" />
-                                                                        <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
-                                                                    </LinearGradientBrush>
-                                                                </Rectangle.Fill>
-                                                            </Rectangle>
-
-                                                            <TextBlock Text="{Binding IdsPackFormula.Name}" TextWrapping="Wrap" Height="30" IsHitTestVisible="False" Width="50" Margin="-20 15 0 0" FontSize="7" TextAlignment="Center" RenderTransformOrigin="0.5,0.5" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                                <TextBlock.LayoutTransform>
-                                                                    <RotateTransform Angle="90" />
-                                                                </TextBlock.LayoutTransform>
-                                                            </TextBlock>
-                                                        </Grid>
-                                                    </UniformGrid>
-
-                                                    <Grid Grid.Row="1" Margin="3" IsHitTestVisible="False">
-                                                        <Grid.Style>
-                                                            <Style TargetType="Grid">
-                                                                <Style.Triggers>
-                                                                    <DataTrigger Binding="{Binding CartridgeType}" Value="{x:Null}">
-                                                                        <Setter Property="Opacity" Value="0.2"></Setter>
-                                                                    </DataTrigger>
-                                                                </Style.Triggers>
-                                                            </Style>
-                                                        </Grid.Style>
-                                                        <Border BorderBrush="#252525" BorderThickness="1" CornerRadius="3">
-                                                            <Border.Background>
-                                                                <LinearGradientBrush>
-                                                                    <GradientStop Color="#FF252525"/>
-                                                                    <GradientStop Color="#FF838383" Offset="1"/>
-                                                                </LinearGradientBrush>
-                                                            </Border.Background>
-                                                        </Border>
-                                                        <Border BorderBrush="#252525" BorderThickness="1" CornerRadius="3">
-                                                            <Border.Background>
-                                                                <LinearGradientBrush Opacity="0.7">
-                                                                    <GradientStop Offset="0" Color="Transparent" />
-                                                                    <GradientStop Offset="1" Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
-                                                                </LinearGradientBrush>
-                                                            </Border.Background>
-                                                        </Border>
-                                                    </Grid>
-                                                </Grid>
-                                            </DataTemplate>
-                                        </ItemsControl.ItemTemplate>
-                                    </ListBox>
-
-                                    <Grid Margin="0 50 0 0">
-                                        <Grid.Style>
-                                            <Style TargetType="Grid">
-                                                <Setter Property="Visibility" Value="Hidden"></Setter>
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding Configuration.IdsPacks.Count}" Value="0">
-                                                        <Setter Property="Visibility" Value="Visible"></Setter>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Grid.Style>
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold" Foreground="Gainsboro">NO IDS PACKS</TextBlock>
-                                    </Grid>
-
-                                    <Rectangle VerticalAlignment="Bottom" Stroke="DimGray" StrokeThickness="1">
-                                        <Rectangle.Effect>
-                                            <DropShadowEffect ShadowDepth="1" Opacity="1" Color="Black" />
-                                        </Rectangle.Effect>
-                                    </Rectangle>
-                                </Grid>
-
-                                <Grid x:Name="gridEmbedded" Style="{StaticResource draggableGrid}" Width="70" Height="100" Canvas.Left="80" Canvas.Top="331" IsHitTestVisible="True" SnapsToDevicePixels="True" dragAndDrop:DragAndDropService.Drop="OnEmbeddedDrop">
-                                    <Image Source="../Images/ti-tm4c129x.png" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                </Grid>
-
-                                <Grid Width="61" IsHitTestVisible="True" SnapsToDevicePixels="True" ClipToBounds="True" Height="42" Canvas.Left="85" Canvas.Top="385">
-                                    <StackPanel Orientation="Horizontal">
-                                        <Image Source="../Images/embedded.png" Width="10" VerticalAlignment="Center" Margin="1" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <TextBlock VerticalAlignment="Center" Padding="1" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="5" TextAlignment="Center" TextWrapping="Wrap" Height="15" Margin="0,6,0,0" Width="47"><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Name}"/><Run Text=" "/><Run Text="{Binding Configuration.EmbeddedFirmwareVersion.Version}"/></TextBlock>
-                                    </StackPanel>
-                                </Grid>
-
-                                <TextBlock Canvas.Top="163" Canvas.Left="288" FontStyle="Italic" Foreground="Gray">Touch Panel</TextBlock>
-                                <Grid Width="53" Height="55" Canvas.Top="184" Canvas.Left="279">
-                                    <Rectangle Stroke="Gray" VerticalAlignment="Bottom" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                    <Rectangle Stroke="Gray" HorizontalAlignment="Right" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                </Grid>
-
-                                <TextBlock Canvas.Top="441" Canvas.Left="156" FontStyle="Italic" Foreground="Gray">Embedded Firmware</TextBlock>
-                                <Grid Width="82" Height="26" Canvas.Top="410" Canvas.Left="158">
-                                    <Rectangle Stroke="Gray" VerticalAlignment="Top" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                    <Rectangle Stroke="Gray" HorizontalAlignment="Right" StrokeThickness="1" StrokeDashArray="6" RenderTransformOrigin="0.5,0.5"/>
-                                </Grid>
-
-                                <TextBlock Canvas.Top="310" Canvas.Left="340" FontStyle="Italic" Foreground="Gray">Dispensers</TextBlock>
-                                <Grid Width="53" Height="20" Canvas.Top="331" Canvas.Left="377">
-                                    <Rectangle Stroke="Gray" VerticalAlignment="Bottom" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                    <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                </Grid>
-
-                                <TextBlock Canvas.Top="395" Canvas.Left="331" FontStyle="Italic" Foreground="Gray">Mid Tanks</TextBlock>
-                                <Grid Width="62" Height="29" Canvas.Top="418" Canvas.Left="357">
-                                    <Rectangle Stroke="Gray" VerticalAlignment="Bottom" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                    <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                </Grid>
-
-                                <TextBlock Canvas.Top="469" Canvas.Left="304" FontStyle="Italic" Foreground="Gray">Cartridges</TextBlock>
-                                <Grid Width="87" Height="10" Canvas.Top="487" Canvas.Left="332">
-                                    <Rectangle Stroke="Gray" VerticalAlignment="Bottom" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                    <Rectangle Stroke="Gray" HorizontalAlignment="Left" StrokeThickness="1" StrokeDashArray="5" RenderTransformOrigin="0.5,0.5"/>
-                                </Grid>
-
-                                <Grid x:Name="gridTablet" Width="67" IsHitTestVisible="True" SnapsToDevicePixels="True" ClipToBounds="True" Height="90" Canvas.Left="188" Canvas.Top="198" dragAndDrop:DragAndDropService.Drop="OnTabletDrop" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.DraggableBackground="#151515">
-                                    <Grid.Style>
-                                        <Style TargetType="Grid" BasedOn="{StaticResource draggableGrid}">
-                                            <Setter Property="Background" Value="#2B2B2B"></Setter>
-                                            <Style.Triggers>
-                                                <Trigger Property="dragAndDrop:DragAndDropService.IsDraggableOver" Value="True">
-                                                    <Setter Property="Background" Value="Black"></Setter>
-                                                </Trigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Grid.Style>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="1*" />
-                                        <RowDefinition Height="1*" />
-                                        <RowDefinition Height="1*" />
-                                    </Grid.RowDefinitions>
-
-                                    <StackPanel>
-                                        <Image Source="../Images/tablet.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <TextBlock Padding="2 0 2 0" Foreground="Gainsboro"  IsHitTestVisible="False" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationDisplayPanelVersion.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationDisplayPanelVersion.Version}"></Run>
-                                        </TextBlock>
-                                    </StackPanel>
-
-
-                                    <StackPanel Grid.Row="1" >
-                                        <Image Source="../Images/application-firmware.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationFirmwareVersion.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationFirmwareVersion.Version}"></Run>
-                                        </TextBlock>
-                                    </StackPanel>
-
-                                    <StackPanel Grid.Row="2" >
-                                        <Image Source="../Images/android.png" Width="10" Margin="2" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                        <TextBlock Padding="2 0 2 0" IsHitTestVisible="False" Foreground="Gainsboro" FontSize="6" TextAlignment="Center" TextWrapping="Wrap">
-                                        <Run Text="{Binding Configuration.ApplicationOsVersion.Name}"></Run>
-                                        <Run Text="{Binding Configuration.ApplicationOsVersion.Version}"></Run>
-                                        </TextBlock>
-                                    </StackPanel>
-                                </Grid>
-                            </Canvas>
-                        </Grid>
-                    </Viewbox>
-                </Grid>
-
-
-                <Grid>
-                    <TextBlock Margin="10" FontStyle="Italic" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Top" Foreground="Gray" FontSize="16">IDS PACKS</TextBlock>
-                    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                        <ItemsControl ItemsSource="{Binding Configuration.IdsPacks}" FontSize="10" Foreground="DimGray" Margin="10 30 10 10">
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate>
-                                    <StackPanel>
-                                        <TextBox materialDesign:HintAssist.Hint="IDS Pack Name..." Text="{Binding Name,UpdateSourceTrigger=PropertyChanged}" FontWeight="Bold" FontSize="12" Margin="5"></TextBox>
-                                        <StackPanel Margin="20 0 0 0">
-                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
-                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/injection.png" Width="12" VerticalAlignment="Center"></Image>
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Dispenser:</Run> <Run FontStyle="Italic" Text="{Binding DispenserType.Name}"></Run></TextBlock>
-                                            </StackPanel>
-                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
-                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/tank.png" Width="12" VerticalAlignment="Center"></Image>
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Mid Tank:</Run> <Run FontStyle="Italic" Text="{Binding MidTankType.Name}"></Run></TextBlock>
-                                            </StackPanel>
-                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
-                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/cartridge.png" Width="12" VerticalAlignment="Center"></Image>
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Cartridge:</Run> <Run FontStyle="Italic" Text="{Binding CartridgeType.Name}"></Run></TextBlock>
-                                            </StackPanel>
-                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
-                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/liquid.png" Width="12" VerticalAlignment="Center"></Image>
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Liquid:</Run> <Run FontStyle="Italic" Text="{Binding LiquidType.Name}"></Run></TextBlock>
-                                            </StackPanel>
-                                            <StackPanel Orientation="Horizontal" Margin="0 3 0 3">
-                                                <Image RenderOptions.BitmapScalingMode="Fant" Source="../Images/formula.png" Width="12" VerticalAlignment="Center"></Image>
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center"><Run FontWeight="Bold">Formula:</Run> <Run FontStyle="Italic" Text="{Binding IdsPackFormula.Name}"></Run></TextBlock>
-                                            </StackPanel>
-                                        </StackPanel>
-                                    </StackPanel>
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
-                    </ScrollViewer>
-
-                    <Rectangle HorizontalAlignment="Right" Margin="0 20 0 20" Stroke="Gainsboro" StrokeThickness="1" StrokeDashArray="5 5 5 5"></Rectangle>
-                </Grid>
-            </Grid>
-
-            <Grid Grid.Column="1" IsEnabled="{Binding CanWork}">
-                <Grid.RowDefinitions>
-                    <RowDefinition/>
-                    <RowDefinition Height="60"/>
-                </Grid.RowDefinitions>
-                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                    <Grid>
-                        <StackPanel>
-                            <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}" Padding="20 10">
-                                <StackPanel>
-                                    <TextBlock Text="MACHINE CONFIGURATION" Foreground="Gray" FontWeight="Bold" FontStyle="Italic" FontSize="16"></TextBlock>
-
-                                    <TextBlock Margin="0 10 0 0" FontSize="10" Foreground="Gray">Serial Number</TextBlock>
-                                    <TextBox Text="{Binding Machine.SerialNumber,UpdateSourceTrigger=PropertyChanged}"></TextBox>
-
-                                    <TextBlock Margin="0 15 0 0" FontSize="10" Foreground="Gray">Machine Name</TextBlock>
-                                    <TextBox Text="{Binding Machine.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
-
-                                    <TextBlock Margin="0 15 0 0" FontSize="10" Foreground="Gray">Machine Version</TextBlock>
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="1*"></ColumnDefinition>
-                                            <ColumnDefinition Width="80"></ColumnDefinition>
-                                        </Grid.ColumnDefinitions>
-                                        <ComboBox ItemsSource="{Binding Adapter.MachineVersions}" SelectedItem="{Binding Machine.MachineVersion}" DisplayMemberPath="Name"></ComboBox>
-                                        <Button Grid.Column="1" Command="{Binding SetVersionConfigurationCommand}" Height="25" Margin="10 2 2 2" ToolTip="Sets the current configuration to the selected machine version default configuration">SET</Button>
-                                    </Grid>
-
-                                    <TextBlock Margin="0 15 0 0" FontSize="10" Foreground="Gray">Organization</TextBlock>
-                                    <ComboBox ItemsSource="{Binding Adapter.Organizations}" SelectedItem="{Binding Machine.Organization}" DisplayMemberPath="Name"></ComboBox>
-
-                                    <UniformGrid Columns="2" Margin="0 15 0 0">
-                                        <TextBlock FontSize="10" Foreground="Gray" VerticalAlignment="Center">Enable Synchronization</TextBlock>
-                                        <ToggleButton HorizontalAlignment="Right" IsChecked="{Binding Machine.Synched}"></ToggleButton>
-                                    </UniformGrid>
-
-                                    <TextBlock Margin="0 15 0 0" FontSize="10" Foreground="Gray">Configuration Name</TextBlock>
-                                    <TextBox Text="{Binding Configuration.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
-                                </StackPanel>
-                            </materialDesign:Card>
-
-                            <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
-                                <StackPanel>
-                                    <Expander HorizontalAlignment="Stretch" Header="Configuration History">
-                                        <ListBox ItemsSource="{Binding History}" HorizontalContentAlignment="Stretch" SelectedItem="{Binding SelectedHistoryConfiguration}">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <materialDesign:PackIcon Kind="Clock" Width="24" Height="24"  VerticalAlignment="Center"></materialDesign:PackIcon>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray" Margin="0 2 0 0"><Run Text="{Binding CreationDate}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                </StackPanel>
-                            </materialDesign:Card>
-
-                            <materialDesign:Card Margin="5,10,5,0" Padding="10" Background="{DynamicResource MaterialDesignBackground}">
-                                <DockPanel>
-                                    <materialDesign:PackIcon Kind="Magnify" Width="28" Height="28"></materialDesign:PackIcon>
-                                    <TextBox Margin="5 0 0 0" materialDesign:HintAssist.Hint="Search Component..." Text="{Binding Filter,UpdateSourceTrigger=PropertyChanged}"></TextBox>
-                                </DockPanel>
-                            </materialDesign:Card>
-                            <materialDesign:Card Margin="5,10,5,0" Background="{DynamicResource MaterialDesignBackground}">
-                                <StackPanel>
-                                    <Expander HorizontalAlignment="Stretch" Header="Dispensers">
-                                        <ListBox ItemsSource="{Binding Adapter.DispenserTypesViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/injection.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Mid Tanks">
-                                        <ListBox ItemsSource="{Binding Adapter.MidTankTypesViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/tank.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Cartridges">
-                                        <ListBox ItemsSource="{Binding Adapter.CartridgeTypesViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/cartridge.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Liquids">
-                                        <ListBox ItemsSource="{Binding Adapter.LiquidTypesViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/liquid.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
-                                                                <Rectangle Height="5" Width="170">
-                                                                    <Rectangle.Fill>
-                                                                        <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                                                                    </Rectangle.Fill>
-                                                                </Rectangle>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="IDS Pack Formulas">
-                                        <ListBox ItemsSource="{Binding Adapter.IdsPackFormulasViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/formula.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Touch Panels">
-                                        <ListBox ItemsSource="{Binding Adapter.ApplicationDisplayPanelVersionsViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/tablet.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Operation Systems">
-                                        <ListBox ItemsSource="{Binding Adapter.ApplicationOsVersionsViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/android.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Application Firmwares">
-                                        <ListBox ItemsSource="{Binding Adapter.ApplicationFirmwareVersionsViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/application-firmware.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Embedded Firmwares">
-                                        <ListBox ItemsSource="{Binding Adapter.EmbeddedFirmwareVersionsViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/embedded.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                    <Border Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource MaterialDesignDivider}" SnapsToDevicePixels="True" />
-                                    <Expander HorizontalAlignment="Stretch" Header="Hardware Versions">
-                                        <ListBox ItemsSource="{Binding Adapter.HardwareVersionsViewSource}" HorizontalContentAlignment="Stretch">
-                                            <ListBox.ItemContainerStyle>
-                                                <Style TargetType="ListBoxItem" BasedOn="{StaticResource {x:Type ListBoxItem}}">
-                                                    <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="VerticalContentAlignment" Value="Stretch"></Setter>
-                                                    <Setter Property="Padding" Value="1"></Setter>
-                                                </Style>
-                                            </ListBox.ItemContainerStyle>
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <Grid Background="Transparent" IsHitTestVisible="True" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
-                                                        <StackPanel Orientation="Horizontal" Margin="2 8">
-                                                            <Image IsHitTestVisible="False" Width="24" Height="24" Source="../Images/hardware.png" Stretch="Fill" RenderOptions.BitmapScalingMode="Fant"></Image>
-                                                            <StackPanel Margin="5 0 0 0" IsHitTestVisible="False">
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run Text="{Binding Name}"></Run></TextBlock>
-                                                                <TextBlock IsHitTestVisible="False" FontSize="10" Foreground="DimGray"><Run>v</Run><Run Text="{Binding Version}"></Run></TextBlock>
-                                                            </StackPanel>
-                                                        </StackPanel>
-
-                                                        <Rectangle Margin="0 10 0 0" VerticalAlignment="Bottom" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
-                                                    </Grid>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </Expander>
-                                </StackPanel>
-                            </materialDesign:Card>
-                        </StackPanel>
-                    </Grid>
-                </ScrollViewer>
-
-                <Grid Grid.Row="1" Margin="10">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="61*"/>
-                            <ColumnDefinition Width="84*"/>
-                        </Grid.ColumnDefinitions>
-                        <Button Height="Auto" Command="{Binding SaveCommand}" Margin="0 0 5 0">
-                            <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon Width="20" Height="20" VerticalAlignment="Center" Kind="ContentSaveSettings"></materialDesign:PackIcon>
-                                <TextBlock FontSize="14" Margin="10 0 0 0" VerticalAlignment="Center">SAVE</TextBlock>
-                            </StackPanel>
-                        </Button>
-                        <Button ToolTip="Set this configuration as a default machine configuration" Height="Auto" Background="#FF5C5C" BorderBrush="#FF5C5C" Command="{Binding SetAsDefaultCommand}" Margin="0 0 15 0" Grid.Column="1">
-                            <StackPanel Orientation="Horizontal">
-                                <materialDesign:PackIcon Width="20" Height="20" VerticalAlignment="Center" Kind="Verified"></materialDesign:PackIcon>
-                                <TextBlock FontSize="14" Margin="10 0 0 0" VerticalAlignment="Center">SET DEFAULT</TextBlock>
-                            </StackPanel>
-                        </Button>
-                    </Grid>
-                </Grid>
-            </Grid>
-        </Grid>
-
-        <dragAndDrop:DraggingSurface x:Name="dragSufrace" />
+        <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide">
+            <local:MachinesView />
+            <local:MachineDetailsView/>
+        </controls:NavigationControl>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
index 9c7496484..7e1b60a28 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MainView.xaml.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -10,163 +9,28 @@ using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using Tango.BL.Entities;
-using Tango.DragAndDrop;
-using Tango.MachineStudio.MachineDesigner.ViewModels;
+using Tango.Core.DI;
+using Tango.MachineStudio.MachineDesigner.Contracts;
 
 namespace Tango.MachineStudio.MachineDesigner.Views
 {
     /// <summary>
     /// Interaction logic for MainView.xaml
     /// </summary>
-    public partial class MainView : UserControl
+    public partial class MainView : UserControl , IMainView
     {
-        private MainViewVM _vm;
-        private Rectangle _highlightRect;
-        private bool _highlightShown;
-        private DoubleAnimation _highlightAnimation;
-
-        public ColumnDefinition PanelColumnDefinition { get; set; }
-
         public MainView()
         {
             InitializeComponent();
-
-            PanelColumnDefinition = panelColumnDefinition;
-
-            DraggingSurface = dragSufrace;
-            this.Loaded += (x, y) =>
-            {
-                _vm = DataContext as MainViewVM;
-            };
-
-            DragAndDropService.DragStarted += DragAndDropService_DragStarted;
-            DragAndDropService.DragEnded += DragAndDropService_DragEnded;
-
-            _highlightRect = new Rectangle();
-            _highlightRect.IsHitTestVisible = false;
-            _highlightRect.Stroke = Application.Current.Resources["AccentColorBrush"] as Brush;
-            _highlightRect.StrokeThickness = 2;
-            _highlightRect.StrokeDashArray = new DoubleCollection(new double[] { 3, 3, 3, 3 });
-        }
-
-        private void DragAndDropService_DragEnded(object sender, FrameworkElement e)
-        {
-            canvas.Children.Remove(_highlightRect);
-            _highlightShown = false;
-            _highlightRect.BeginAnimation(Rectangle.OpacityProperty, null);
-        }
-
-        private void DragAndDropService_DragStarted(object sender, FrameworkElement e)
-        {
-            if (e.DataContext is HardwareVersion)
-            {
-                SetHighlightRegion(hardwareGrid);
-            }
-            else if (e.DataContext is ApplicationOsVersion || e.DataContext is ApplicationDisplayPanelVersion || e.DataContext is ApplicationFirmwareVersion)
-            {
-                SetHighlightRegion(gridTablet);
-            }
-            else if (e.DataContext is EmbeddedFirmwareVersion)
-            {
-                SetHighlightRegion(gridEmbedded);
-            }
-            else if (e.DataContext is DispenserType || e.DataContext is CartridgeType || e.DataContext is LiquidType || e.DataContext is MidTankType || e.DataContext is IdsPackFormula)
-            {
-                SetHighlightRegion(gridIds);
-            }
-        }
-
-        public DraggingSurface DraggingSurface
-        {
-            get { return (DraggingSurface)GetValue(DraggingSurfaceProperty); }
-            set { SetValue(DraggingSurfaceProperty, value); }
-        }
-        public static readonly DependencyProperty DraggingSurfaceProperty =
-            DependencyProperty.Register("DraggingSurface", typeof(DraggingSurface), typeof(MainView), new PropertyMetadata(null));
-
-        private void OnDropOnIdsPack(object sender, DropEventArgs e)
-        {
-            if (e.Draggable.DataContext is DispenserType)
-            {
-                _vm.DropDispenserType(e.Draggable.DataContext as DispenserType, e.Droppable.DataContext as IdsPack);
-            }
-            else if (e.Draggable.DataContext is LiquidType)
-            {
-                _vm.DropLiquidType(e.Draggable.DataContext as LiquidType, e.Droppable.DataContext as IdsPack);
-            }
-            else if (e.Draggable.DataContext is CartridgeType)
-            {
-                _vm.DropCartridgeType(e.Draggable.DataContext as CartridgeType, e.Droppable.DataContext as IdsPack);
-            }
-            else if (e.Draggable.DataContext is MidTankType)
-            {
-                _vm.DropMidTankType(e.Draggable.DataContext as MidTankType, e.Droppable.DataContext as IdsPack);
-            }
-            else if (e.Draggable.DataContext is IdsPackFormula)
-            {
-                _vm.DropIdsFormula(e.Draggable.DataContext as IdsPackFormula, e.Droppable.DataContext as IdsPack);
-            }
-            else if (e.Draggable.DataContext is IdsPack)
-            {
-                _vm.DropIdsPack(e.Draggable.DataContext as IdsPack, e.Droppable.DataContext as IdsPack);
-            }
-        }
-
-        private void OnTabletDrop(object sender, DropEventArgs e)
-        {
-            if (e.Draggable.DataContext is ApplicationDisplayPanelVersion)
-            {
-                _vm.DropTouchPanel(e.Draggable.DataContext as ApplicationDisplayPanelVersion);
-            }
-            else if (e.Draggable.DataContext is ApplicationOsVersion)
-            {
-                _vm.DropApplicationOsVersion(e.Draggable.DataContext as ApplicationOsVersion);
-            }
-            else if (e.Draggable.DataContext is ApplicationFirmwareVersion)
-            {
-                _vm.DropApplicationFirmwareVersion(e.Draggable.DataContext as ApplicationFirmwareVersion);
-            }
-        }
-
-        private void OnEmbeddedDrop(object sender, DropEventArgs e)
-        {
-            if (e.Draggable.DataContext is EmbeddedFirmwareVersion)
-            {
-                _vm.DropEmbeddedFirmware(e.Draggable.DataContext as EmbeddedFirmwareVersion);
-            }
-        }
-
-        private void MachineDrop(object sender, DropEventArgs e)
-        {
-            if (e.Draggable.DataContext is HardwareVersion)
-            {
-                _vm.DropHardwareVersion(e.Draggable.DataContext as HardwareVersion);
-            }
+            TangoIOC.Default.Register<IMainView>(this);
         }
 
-        private void SetHighlightRegion(FrameworkElement element)
+        public void NavigateTo(MachineDesignerNavigationView view)
         {
-            if (!_highlightShown)
-            {
-                _highlightRect.Width = element.Width;
-                _highlightRect.Height = element.Height;
-                Canvas.SetLeft(_highlightRect, Canvas.GetLeft(element));
-                Canvas.SetTop(_highlightRect, Canvas.GetTop(element));
-                canvas.Children.Add(_highlightRect);
-                _highlightShown = true;
-                _highlightAnimation = new DoubleAnimation();
-                _highlightAnimation.From = 0;
-                _highlightAnimation.To = 1;
-                _highlightAnimation.Duration = TimeSpan.FromSeconds(0.2);
-                _highlightAnimation.AutoReverse = true;
-                _highlightAnimation.RepeatBehavior = RepeatBehavior.Forever;
-                _highlightRect.BeginAnimation(Rectangle.OpacityProperty, _highlightAnimation);
-            }
+            navigationControl.NavigateTo(view.ToString());
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
new file mode 100644
index 000000000..d04389ae7
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml
@@ -0,0 +1,81 @@
+<UserControl x:Class="Tango.MachineStudio.MachineDesigner.Views.SpoolsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:vm="clr-namespace:Tango.MachineStudio.MachineDesigner.ViewModels"
+             xmlns:global="clr-namespace:Tango.MachineStudio.MachineDesigner"
+              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:local="clr-namespace:Tango.MachineStudio.MachineDesigner.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="720" d:DesignWidth="1280" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+    <Grid Margin="20">
+        <DockPanel>
+            <Grid DockPanel.Dock="Bottom">
+
+            </Grid>
+
+            <Grid Margin="0 20">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="38*"/>
+                    <ColumnDefinition Width="117*"/>
+                </Grid.ColumnDefinitions>
+
+                <local:MachineView Margin="30 80 0 0" DataContext="{Binding ActiveMachine}" IsHitTestVisible="False" VerticalAlignment="Top" Height="241" />
+
+                <DockPanel Grid.Column="1" Margin="50 100">
+                    <Grid DockPanel.Dock="Bottom">
+                        <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0 0 0 0">
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveSpoolCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
+                                    <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
+                                </StackPanel>
+                            </Button>
+                            <Button Margin="0 0 0 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddSpoolCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
+                                    <TextBlock Margin="5 0 0 0" FontSize="16">NEW SPOOL</TextBlock>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+
+                        </StackPanel>
+                    </Grid>
+                    <Grid>
+                        <DataGrid Margin="0 0 0 10" SelectionUnit="FullRow" BorderBrush="Silver" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding ActiveMachine.Spools}" SelectedItem="{Binding SelectedSpool}">
+                            <DataGrid.CellStyle>
+                                <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                                    <Setter Property="BorderThickness" Value="0"/>
+                                    <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                                    <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                                </Style>
+                            </DataGrid.CellStyle>
+                            <DataGrid.Columns>
+                                <DataGridComboBoxColumn Header="SPOOL TYPE" SelectedItemBinding="{Binding SpoolType}" DisplayMemberPath="Name" Width="Auto">
+                                    <DataGridComboBoxColumn.ElementStyle>
+                                        <Style TargetType="ComboBox">
+                                            <Setter Property="ItemsSource" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGrid},Path=DataContext.ActiveMachineAdapter.SpoolTypes}"/>
+                                        </Style>
+                                    </DataGridComboBoxColumn.ElementStyle>
+                                    <DataGridComboBoxColumn.EditingElementStyle>
+                                        <Style TargetType="ComboBox">
+                                            <Setter Property="ItemsSource" Value="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGrid},Path=DataContext.ActiveMachineAdapter.SpoolTypes}"/>
+                                        </Style>
+                                    </DataGridComboBoxColumn.EditingElementStyle>
+                                </DataGridComboBoxColumn>
+                                <DataGridTextColumn Header="START OFFSET PULSES" Binding="{Binding StartOffsetPulses}" Width="Auto" />
+                                <DataGridTextColumn Header="BACKING RATE" Binding="{Binding BackingRate}" Width="Auto" />
+                                <DataGridTextColumn Header="SEGMENT OFFSET PULSES" Binding="{Binding SegmentOffsetPulses}" Width="Auto" />
+                                <DataGridTextColumn Header="BOTTOM BACKING RATE" Binding="{Binding BottomBackingRate}" Width="1*" />
+                            </DataGrid.Columns>
+                        </DataGrid>
+                    </Grid>
+                </DockPanel>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml.cs
new file mode 100644
index 000000000..90a0c37f2
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/SpoolsView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.MachineDesigner.Views
+{
+    /// <summary>
+    /// Interaction logic for SpoolsView.xaml
+    /// </summary>
+    public partial class SpoolsView : UserControl
+    {
+        public SpoolsView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
index ef6fc816b..f8966b729 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.RML/ViewModels/MainViewVM.cs
@@ -206,7 +206,6 @@ namespace Tango.MachineStudio.RML.ViewModels
                     .Set(guid)
                     .WithActiveParametersGroup()
                     .WithLiquidFactors()
-                    .WithMediaProperties()
                     .BuildAsync();
 
                 if (ActiveRML.ProcessParametersTablesGroups.ToList().Count == 0)
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/MainViewVM.cs
index 492ccd30e..fd897e811 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Statistics/ViewModels/MainViewVM.cs
@@ -78,8 +78,11 @@ namespace Tango.MachineStudio.Statistics.ViewModels
 
             InvokeUIOnIdle(() =>
             {
-                GenerateTimelineJobStatusChart();
-                GeneratePieFailedReasonsChart();
+                if (_job_runs.Count > 0)
+                {
+                    GenerateTimelineJobStatusChart();
+                    GeneratePieFailedReasonsChart();
+                }
             });
         }