From d3ba251f01ae987a14b6379e733a06dbcd77f9e4 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 30 Jan 2018 18:21:37 +0200
Subject: Moved Observables to Integration !! Implemented basic sketch for IDS
 Pack Formulation.

---
 .../Converters/BrushStopCMYKToColorConverter.cs    |   2 +-
 .../Converters/BrushStopLabToColorConverter.cs     |   2 +-
 .../Converters/BrushStopToColorConverter.cs        |   2 +-
 .../Converters/BrushStopToOffsetLimitConverter.cs  |   2 +-
 .../Converters/DbRmlViewToEntityConverter.cs       |   2 +-
 .../Converters/InkVolumeToLiquidRmlFactor.cs       |  34 +
 .../Converters/SegmentToGradientStopsConverter.cs  |   2 +-
 .../DeveloperModule.cs                             |   2 +-
 .../Tango.MachineStudio.Developer.csproj           |   9 +-
 .../ViewModels/DBViewContextWrapper.cs             |   2 +-
 .../ViewModels/MainViewVM.cs                       |  14 +-
 .../Views/MainView.xaml                            | 803 +++++++++++++--------
 .../Views/MainView.xaml.cs                         |   2 +-
 13 files changed, 545 insertions(+), 333 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/InkVolumeToLiquidRmlFactor.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopCMYKToColorConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopCMYKToColorConverter.cs
index e21da8fbc..5bc163b18 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopCMYKToColorConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopCMYKToColorConverter.cs
@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 
 namespace Tango.MachineStudio.Developer.Converters
 {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopLabToColorConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopLabToColorConverter.cs
index 6c6d7959e..f3dc07d3e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopLabToColorConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopLabToColorConverter.cs
@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 
 namespace Tango.MachineStudio.Developer.Converters
 {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToColorConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToColorConverter.cs
index 5db8d03c0..33cd8cc78 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToColorConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToColorConverter.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 
 namespace Tango.MachineStudio.Developer.Converters
 {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToOffsetLimitConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToOffsetLimitConverter.cs
index c18a5679b..53efd50b8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToOffsetLimitConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/BrushStopToOffsetLimitConverter.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 
 namespace Tango.MachineStudio.Developer.Converters
 {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/DbRmlViewToEntityConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/DbRmlViewToEntityConverter.cs
index a2f0023cc..1fe3e5ab0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/DbRmlViewToEntityConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/DbRmlViewToEntityConverter.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Developer.ViewModels;
 
 namespace Tango.MachineStudio.Developer.Converters
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/InkVolumeToLiquidRmlFactor.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/InkVolumeToLiquidRmlFactor.cs
new file mode 100644
index 000000000..3b675d23e
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/InkVolumeToLiquidRmlFactor.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using Tango.Integration.Observables;
+using static Tango.Integration.Observables.BrushStop;
+
+namespace Tango.MachineStudio.Developer.Converters
+{
+    //public class InkVolumeToLiquidRmlFactor : IMultiValueConverter
+    //{
+    //    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+    //    {
+    //        InkVolume inkVolume = values[0] as InkVolume;
+    //        Rml selectedRml = values[1] as Rml;
+
+    //        if (inkVolume != null && selectedRml != null)
+    //        {
+    //            return inkVolume.GetLiquidMaxNanoliterPerCentimeter().ToString();
+    //        }
+
+    //        return String.Empty;
+    //    }
+
+    //    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+    //    {
+    //        throw new NotImplementedException();
+    //    }
+    //}
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentToGradientStopsConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentToGradientStopsConverter.cs
index 1588b7740..37908c940 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentToGradientStopsConverter.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/SegmentToGradientStopsConverter.cs
@@ -6,7 +6,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 using System.Windows.Media;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 
 namespace Tango.MachineStudio.Developer.Converters
 {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs
index 4401245a9..1a405f861 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/DeveloperModule.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media.Imaging;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Developer.Views;
 using Tango.SharedUI.Helpers;
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index 5bae48c1a..1865ff11a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -76,6 +76,7 @@
     <Compile Include="Converters\BrushStopToColorConverter.cs" />
     <Compile Include="Converters\BrushStopToOffsetLimitConverter.cs" />
     <Compile Include="Converters\DbRmlViewToEntityConverter.cs" />
+    <Compile Include="Converters\InkVolumeToLiquidRmlFactor.cs" />
     <Compile Include="Converters\SegmentToGradientStopsConverter.cs" />
     <Compile Include="DeveloperModule.cs" />
     <Compile Include="ViewModelLocator.cs" />
@@ -138,10 +139,6 @@
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Tango.DAL.Observables\Tango.DAL.Observables.csproj">
-      <Project>{0ecd6da8-7aa6-48d9-8b65-279d176ad9af}</Project>
-      <Name>Tango.DAL.Observables</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.DAL.Remote\Tango.DAL.Remote.csproj">
       <Project>{38197109-8610-4d3f-92b9-16d48df94d7c}</Project>
       <Name>Tango.DAL.Remote</Name>
@@ -150,6 +147,10 @@
       <Project>{b112d89a-a106-41ae-a0c1-4abc84c477f5}</Project>
       <Name>Tango.DragAndDrop</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Integration\Tango.Integration.csproj">
+      <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project>
+      <Name>Tango.Integration</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.SharedUI\Tango.SharedUI.csproj">
       <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project>
       <Name>Tango.SharedUI</Name>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/DBViewContextWrapper.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/DBViewContextWrapper.cs
index 231c27bf2..21611a493 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/DBViewContextWrapper.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/DBViewContextWrapper.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
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 5a1b46041..f6ddc9d19 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
@@ -9,7 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
 using Tango.Core.Commands;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.MachineStudio.Common.Controls;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.Common.StudioApplication;
@@ -47,8 +47,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
             set
             {
                 _selectedMachine = value;
-                RaisePropertyChangedAuto();
                 OnMachineChanged();
+                RaisePropertyChangedAuto();
                 InvalidateRelayCommands();
 
                 if (_selectedMachine != null)
@@ -145,8 +145,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
             set
             {
                 _selectedRML = value;
-                RaisePropertyChangedAuto();
                 InvalidateLiquidFactorsAndProcessTables();
+                RaisePropertyChangedAuto();
                 InvalidateRelayCommands();
             }
         }
@@ -308,7 +308,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             if (SelectedSegment != null)
             {
-                SetSegmentBrushStopsInkVolumes(SelectedSegment);
+                SetSegmentBrushStopsLiquidVolumes(SelectedSegment);
                 SelectedBrushStop = SelectedSegment.BrushStops.FirstOrDefault();
             }
         }
@@ -347,13 +347,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         #region Private Methods
 
-        private void SetSegmentBrushStopsInkVolumes(Segment segment)
+        private void SetSegmentBrushStopsLiquidVolumes(Segment segment)
         {
             if (!DesignMode)
             {
                 foreach (var stop in segment.BrushStops)
                 {
-                    stop.SetInkVolumes(SelectedMachine.Configuration);
+                    stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML);
                 }
             }
         }
@@ -526,7 +526,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 var stop = new BrushStop();
                 stop.ColorSpace = Adapter.ColorSpaces.FirstOrDefault();
-                stop.SetInkVolumes(SelectedMachine.Configuration);
+                stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML);
                 SelectedSegment.BrushStops.Add(stop);
             }
         }
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 90842b672..6e4d69d05 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
@@ -14,7 +14,7 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels"
              xmlns:localConverters="clr-namespace:Tango.MachineStudio.Developer.Converters"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
-             xmlns:observables="clr-namespace:Tango.DAL.Observables;assembly=Tango.DAL.Observables"
+             xmlns:observables="clr-namespace:Tango.Integration.Observables;assembly=Tango.Integration"
              xmlns:editors="clr-namespace:Tango.SharedUI.Editors;assembly=Tango.SharedUI"
              xmlns:shapes="clr-namespace:Tango.SharedUI.Shapes;assembly=Tango.SharedUI"
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
@@ -344,8 +344,8 @@
                             <RowDefinition x:Name="graphRowDefinition" Height="440"/>
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="173*"/>
-                            <ColumnDefinition Width="467*"/>
+                            <ColumnDefinition Width="350"/>
+                            <ColumnDefinition Width="1*"/>
                         </Grid.ColumnDefinitions>
 
 
@@ -360,14 +360,16 @@
 
                                     <Rectangle VerticalAlignment="Bottom" StrokeDashArray="7" StrokeThickness="1" Stroke="Silver" Margin="0 8 0 0"></Rectangle>
                                 </StackPanel>
-                                <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom" HorizontalAlignment="Right">
-                                    <Button Command="{Binding RemoveJobCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Remove Job">
-                                        <materialDesign:PackIcon Kind="MinusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
-                                    </Button>
-                                    <Button Command="{Binding AddJobCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Add Job">
-                                        <materialDesign:PackIcon Kind="PlusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
-                                    </Button>
-                                </StackPanel>
+                                <Border DockPanel.Dock="Bottom" Background="{StaticResource SideBarBackground}">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                                        <Button Command="{Binding RemoveJobCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Remove Job">
+                                            <materialDesign:PackIcon Kind="MinusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
+                                        </Button>
+                                        <Button Command="{Binding AddJobCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Add Job">
+                                            <materialDesign:PackIcon Kind="PlusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
+                                        </Button>
+                                    </StackPanel>
+                                </Border>
                                 <ListBox ItemsSource="{Binding SelectedMachine.Jobs}" SelectedItem="{Binding SelectedJob}" Margin="0 10 0 0">
                                     <ListBox.ItemTemplate>
                                         <DataTemplate>
@@ -458,336 +460,511 @@
                                             </StackPanel>
                                         </Border>
 
-                                        <StackPanel Width="180">
-                                            <StackPanel Orientation="Horizontal" Margin="10 0 0 0">
-                                                <Image Source="../Images/description.png" Width="32"></Image>
-                                                <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Description</TextBlock>
-                                            </StackPanel>
+                                        <Border Style="{StaticResource JobFieldBorder}" Height="90">
+                                            <StackPanel Width="200">
+                                                <StackPanel Orientation="Horizontal" Margin="10 0 0 0">
+                                                    <Image Source="../Images/description.png" Width="32"></Image>
+                                                    <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Description</TextBlock>
+                                                </StackPanel>
 
-                                            <Border BorderThickness="1" BorderBrush="Silver" CornerRadius="5" Margin="0 0 5 5">
-                                                <TextBox Style="{x:Null}" BorderThickness="0" Margin="5" Height="40" Text="{Binding SelectedJob.Description}" VerticalAlignment="Stretch" materialDesign:HintAssist.Hint="Enter description" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"></TextBox>
-                                            </Border>
-                                        </StackPanel>
+                                                <Border BorderThickness="0" BorderBrush="Silver" CornerRadius="5" Margin="0 0 5 5">
+                                                    <TextBox Padding="5 0 0 0" FontStyle="Italic" Background="Transparent" Style="{x:Null}" BorderThickness="0" Margin="5" Height="40" Text="{Binding SelectedJob.Description}" VerticalAlignment="Stretch" materialDesign:HintAssist.Hint="Enter description" AcceptsReturn="True" TextWrapping="Wrap" VerticalScrollBarVisibility="Auto"></TextBox>
+                                                </Border>
+                                            </StackPanel>
+                                        </Border>
                                     </StackPanel>
 
 
                                 </StackPanel>
 
                                 <Grid Grid.Row="1" Margin="0 20 0 0">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="200"/>
-                                        <ColumnDefinition Width="1*"/>
-                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="1*" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="200"/>
+                                            <ColumnDefinition Width="1*"/>
+                                        </Grid.ColumnDefinitions>
 
-                                    <DockPanel>
-                                        <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-                                            <Image Source="../Images/segment.png" Width="42"></Image>
-                                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" Foreground="DimGray" FontSize="16" FontWeight="SemiBold">SEGMENTS</TextBlock>
-                                        </StackPanel>
+                                        <DockPanel>
+                                            <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
+                                                <Image Source="../Images/segment.png" Width="42"></Image>
+                                                <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" Foreground="DimGray" FontSize="16" FontWeight="SemiBold">SEGMENTS</TextBlock>
+                                            </StackPanel>
 
-                                        <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom" HorizontalAlignment="Right">
-                                            <Button Command="{Binding RemoveSegmentCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Remove Segment">
-                                                <materialDesign:PackIcon Kind="MinusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
-                                            </Button>
-                                            <Button Command="{Binding AddSegmentCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Add Segment">
-                                                <materialDesign:PackIcon Kind="PlusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
-                                            </Button>
-                                        </StackPanel>
+                                            <Border DockPanel.Dock="Bottom" Background="{StaticResource SideBarBackground}">
+                                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                                                    <Button Command="{Binding RemoveSegmentCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Remove Segment">
+                                                        <materialDesign:PackIcon Kind="MinusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
+                                                    </Button>
+                                                    <Button Command="{Binding AddSegmentCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Add Segment">
+                                                        <materialDesign:PackIcon Kind="PlusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
+                                                    </Button>
+                                                </StackPanel>
+                                            </Border>
 
-                                        <ListBox SelectionChanged="ListBox_SelectionChanged" ItemsSource="{Binding SelectedJob.Segments}" SelectedItem="{Binding SelectedSegment}">
-                                            <ListBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
-                                                        <Image Source="../Images/segment-single.png" Width="24"></Image>
-                                                        <TextBlock Margin="5 0 0 0" Text="{Binding Name}" FontSize="12" FontWeight="SemiBold" VerticalAlignment="Center"></TextBlock>
-                                                    </StackPanel>
-                                                </DataTemplate>
-                                            </ListBox.ItemTemplate>
-                                        </ListBox>
-                                    </DockPanel>
+                                            <ListBox SelectionChanged="ListBox_SelectionChanged" ItemsSource="{Binding SelectedJob.Segments}" SelectedItem="{Binding SelectedSegment}">
+                                                <ListBox.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <StackPanel Orientation="Horizontal" Margin="0 5 0 0">
+                                                            <Image Source="../Images/segment-single.png" Width="24"></Image>
+                                                            <TextBlock Margin="5 0 0 0" Text="{Binding Name}" FontSize="12" FontWeight="SemiBold" VerticalAlignment="Center"></TextBlock>
+                                                        </StackPanel>
+                                                    </DataTemplate>
+                                                </ListBox.ItemTemplate>
+                                            </ListBox>
+                                        </DockPanel>
 
-                                    <Grid Grid.Column="1" Margin="10 5 0 0">
-                                        <DockPanel>
-                                            <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
-                                                <Image Source="../Images/segment-single.png" Width="24"></Image>
-                                                <TextBlock Margin="5 0 0 0" Text="{Binding SelectedSegment.Name,FallbackValue=''}" FontSize="16" FontWeight="SemiBold" VerticalAlignment="Center"></TextBlock>
-                                            </StackPanel>
+                                        <Grid Grid.Column="1" Margin="10 5 0 0">
+                                            <DockPanel>
+                                                <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
+                                                    <Image Source="../Images/segment-single.png" Width="24"></Image>
+                                                    <TextBlock Margin="5 0 0 0" Text="{Binding SelectedSegment.Name,FallbackValue=''}" FontSize="16" FontWeight="SemiBold" VerticalAlignment="Center"></TextBlock>
+                                                </StackPanel>
 
-                                            <Grid Margin="0 10 0 0">
-                                                <DockPanel>
-                                                    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
-                                                        <Border Style="{StaticResource JobFieldBorder}">
-                                                            <StackPanel Margin="5" Width="140">
-                                                                <StackPanel Orientation="Horizontal">
-                                                                    <Image Source="../Images/name.png" Width="32"></Image>
-                                                                    <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Name</TextBlock>
-                                                                </StackPanel>
-                                                                <TextBox Margin="0 3 0 0" Text="{Binding SelectedSegment.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
-                                                            </StackPanel>
-                                                        </Border>
-                                                        <Border Style="{StaticResource JobFieldBorder}">
-                                                            <StackPanel Margin="5" Width="140">
+                                                <Grid Margin="0 10 0 0">
+                                                    <DockPanel>
+                                                        <Grid DockPanel.Dock="Top">
+                                                            <Grid>
                                                                 <StackPanel Orientation="Horizontal">
-                                                                    <Image Source="../Images/ruler.png" Width="32"></Image>
-                                                                    <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Length</TextBlock>
+                                                                    <Border Style="{StaticResource JobFieldBorder}">
+                                                                        <StackPanel Margin="5" Width="140">
+                                                                            <StackPanel Orientation="Horizontal">
+                                                                                <Image Source="../Images/name.png" Width="32"></Image>
+                                                                                <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Name</TextBlock>
+                                                                            </StackPanel>
+                                                                            <TextBox Margin="0 3 0 0" Text="{Binding SelectedSegment.Name,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                                                                        </StackPanel>
+                                                                    </Border>
+                                                                    <Border Style="{StaticResource JobFieldBorder}">
+                                                                        <StackPanel Margin="5" Width="140">
+                                                                            <StackPanel Orientation="Horizontal">
+                                                                                <Image Source="../Images/ruler.png" Width="32"></Image>
+                                                                                <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Length</TextBlock>
+                                                                            </StackPanel>
+                                                                            <mahapps:NumericUpDown IsEnabled="{Binding SelectedJob.EnableInterSegment}" 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}"></mahapps:NumericUpDown>
+                                                                        </StackPanel>
+                                                                    </Border>
                                                                 </StackPanel>
-                                                                <mahapps:NumericUpDown IsEnabled="{Binding SelectedJob.EnableInterSegment}" 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}"></mahapps:NumericUpDown>
+
+                                                                <Grid HorizontalAlignment="Right">
+                                                                    <StackPanel Orientation="Horizontal">
+
+                                                                    </StackPanel>
+                                                                </Grid>
+                                                            </Grid>
+                                                        </Grid>
+
+                                                        <Border DockPanel.Dock="Bottom" Background="{StaticResource SideBarBackground}">
+                                                            <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom" HorizontalAlignment="Right">
+                                                                <Button Command="{Binding RemoveBrushStopCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Remove Color">
+                                                                    <materialDesign:PackIcon Kind="MinusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
+                                                                </Button>
+                                                                <Button Command="{Binding AddBrushStopCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Add Color">
+                                                                    <materialDesign:PackIcon Kind="PlusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
+                                                                </Button>
                                                             </StackPanel>
                                                         </Border>
-                                                    </StackPanel>
 
-                                                    <Grid DockPanel.Dock="Bottom">
-                                                        <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom" HorizontalAlignment="Right">
-                                                            <Button Command="{Binding RemoveBrushStopCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Remove Color">
-                                                                <materialDesign:PackIcon Kind="MinusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
-                                                            </Button>
-                                                            <Button Command="{Binding AddBrushStopCommand}" Margin="5" Style="{StaticResource MaterialDesignFlatButton}" Padding="0" ToolTip="Add Color">
-                                                                <materialDesign:PackIcon Kind="PlusCircleOutline" Width="24" Height="24"></materialDesign:PackIcon>
-                                                            </Button>
-                                                        </StackPanel>
-                                                    </Grid>
-
-                                                    <Grid Margin="0 20 0 0">
-                                                        <DockPanel>
-                                                            <Grid DockPanel.Dock="Top">
-                                                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                                                    <Image Source="../Images/color-palette.png" Width="42"></Image>
-                                                                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" Foreground="DimGray" FontSize="16" FontWeight="SemiBold">SEGMENT BRUSH</TextBlock>
-                                                                </StackPanel>
+                                                        <Grid Margin="0 20 0 0">
+                                                            <DockPanel>
+                                                                <Grid DockPanel.Dock="Top">
+                                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                                                        <Image Source="../Images/color-palette.png" Width="42"></Image>
+                                                                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" Foreground="DimGray" FontSize="16" FontWeight="SemiBold">SEGMENT BRUSH</TextBlock>
+                                                                    </StackPanel>
+
+                                                                    <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="8" Margin="200 0 80 0" StrokeThickness="1" Stroke="Gainsboro">
+                                                                        <Rectangle.Fill>
+                                                                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,0" x:Name="gradientBrush"></LinearGradientBrush>
+                                                                        </Rectangle.Fill>
+                                                                    </Rectangle>
+                                                                </Grid>
+                                                                <Grid Margin="0 10 0 0">
+                                                                    <ListBox Style="{x:Null}" ScrollViewer.CanContentScroll="False" BorderThickness="0" ItemsSource="{Binding SelectedSegment.BrushStops}" SelectedItem="{Binding SelectedBrushStop}" HorizontalContentAlignment="Stretch">
+                                                                        <ListBox.ItemContainerStyle>
+                                                                            <Style TargetType="ListBoxItem" BasedOn="{StaticResource basicListBoxItem}">
 
-                                                                <Rectangle HorizontalAlignment="Stretch" VerticalAlignment="Center" Height="8" Margin="200 0 80 0" StrokeThickness="1" Stroke="Gainsboro">
-                                                                    <Rectangle.Fill>
-                                                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,0" x:Name="gradientBrush"></LinearGradientBrush>
-                                                                    </Rectangle.Fill>
-                                                                </Rectangle>
-                                                            </Grid>
-                                                            <Grid Margin="0 10 0 0">
-                                                                <ListBox Style="{x:Null}" ScrollViewer.CanContentScroll="False" BorderThickness="0" ItemsSource="{Binding SelectedSegment.BrushStops}" SelectedItem="{Binding SelectedBrushStop}" HorizontalContentAlignment="Stretch">
-                                                                    <ListBox.ItemContainerStyle>
-                                                                        <Style TargetType="ListBoxItem" BasedOn="{StaticResource basicListBoxItem}">
+                                                                            </Style>
+                                                                        </ListBox.ItemContainerStyle>
+                                                                        <ItemsControl.ItemTemplate>
+                                                                            <DataTemplate DataType="{x:Type observables:BrushStop}">
+
+                                                                                <StackPanel Margin="0 0 0 5">
+                                                                                    <Border BorderThickness="1" CornerRadius="5" Padding="10" Background="Transparent" dragAndDrop:DragAndDropService.Drop="OnBrushStopBorderDrop">
+                                                                                        <Border.Style>
+                                                                                            <Style TargetType="Border" BasedOn="{StaticResource brushStopBorder}">
+                                                                                                <Setter Property="BorderBrush" Value="{StaticResource SideBarBackground}"></Setter>
+                                                                                                <Setter Property="Background" Value="White"></Setter>
+                                                                                                <Style.Triggers>
+                                                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
+                                                                                                        <Setter Property="BorderBrush" Value="Gainsboro"></Setter>
+                                                                                                        <Setter Property="Background" Value="{StaticResource SideBarBackground}"></Setter>
+                                                                                                    </DataTrigger>
+                                                                                                </Style.Triggers>
+                                                                                            </Style>
+                                                                                        </Border.Style>
+                                                                                        <Grid>
+                                                                                            <DockPanel>
+                                                                                                <ContentControl DockPanel.Dock="Left">
+                                                                                                    <ContentControl.Style>
+                                                                                                        <Style TargetType="ContentControl">
+                                                                                                            <Setter Property="Content">
+                                                                                                                <Setter.Value>
+                                                                                                                    <Rectangle/>
+                                                                                                                </Setter.Value>
+                                                                                                            </Setter>
+                                                                                                            <Style.Triggers>
+                                                                                                                <DataTrigger Binding="{Binding ColorSpace.Name}" Value="Volume">
+                                                                                                                    <Setter Property="Content">
+                                                                                                                        <Setter.Value>
+                                                                                                                            <StackPanel VerticalAlignment="Center">
+                                                                                                                                <ItemsControl ItemsSource="{Binding LiquidVolumes}" VerticalAlignment="Center">
+                                                                                                                                    <ItemsControl.ItemsPanel>
+                                                                                                                                        <ItemsPanelTemplate>
+                                                                                                                                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                                                                                                                                        </ItemsPanelTemplate>
+                                                                                                                                    </ItemsControl.ItemsPanel>
+                                                                                                                                    <ItemsControl.ItemTemplate>
+                                                                                                                                        <DataTemplate>
+                                                                                                                                            <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0">
+                                                                                                                                                <Border.BorderBrush>
+                                                                                                                                                    <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                                                                                                                                </Border.BorderBrush>
+                                                                                                                                                <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                                    <mahapps:NumericUpDown.Resources>
+                                                                                                                                                        <Style TargetType="TextBox"/>
+                                                                                                                                                    </mahapps:NumericUpDown.Resources>
+                                                                                                                                                </mahapps:NumericUpDown>
+                                                                                                                                            </Border>
+                                                                                                                                        </DataTemplate>
+                                                                                                                                    </ItemsControl.ItemTemplate>
+                                                                                                                                </ItemsControl>
+                                                                                                                            </StackPanel>
+                                                                                                                        </Setter.Value>
+                                                                                                                    </Setter>
+                                                                                                                </DataTrigger>
+                                                                                                                <DataTrigger Binding="{Binding ColorSpace.Name}" Value="RGB">
+                                                                                                                    <Setter Property="Content">
+                                                                                                                        <Setter.Value>
+                                                                                                                            <StackPanel Orientation="Horizontal">
+                                                                                                                                <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FF6F6F">
+                                                                                                                                    <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Red, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown.Resources>
+                                                                                                                                            <Style TargetType="TextBox"/>
+                                                                                                                                        </mahapps:NumericUpDown.Resources>
+                                                                                                                                    </mahapps:NumericUpDown>
+                                                                                                                                </Border>
+
+                                                                                                                                <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#92FF92">
+                                                                                                                                    <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Green, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown.Resources>
+                                                                                                                                            <Style TargetType="TextBox"/>
+                                                                                                                                        </mahapps:NumericUpDown.Resources>
+                                                                                                                                    </mahapps:NumericUpDown>
+                                                                                                                                </Border>
+
+                                                                                                                                <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#3C7EF4">
+                                                                                                                                    <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Blue, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown.Resources>
+                                                                                                                                            <Style TargetType="TextBox"/>
+                                                                                                                                        </mahapps:NumericUpDown.Resources>
+                                                                                                                                    </mahapps:NumericUpDown>
+                                                                                                                                </Border>
+
+                                                                                                                                <ContentControl Style="{StaticResource colorPicker}"></ContentControl>
+                                                                                                                            </StackPanel>
+                                                                                                                        </Setter.Value>
+                                                                                                                    </Setter>
+                                                                                                                </DataTrigger>
+                                                                                                                <DataTrigger Binding="{Binding ColorSpace.Name}" Value="CMYK">
+                                                                                                                    <Setter Property="Content">
+                                                                                                                        <Setter.Value>
+                                                                                                                            <StackPanel Orientation="Horizontal">
+                                                                                                                                <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Cyan">
+                                                                                                                                    <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Cyan, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown.Resources>
+                                                                                                                                            <Style TargetType="TextBox"/>
+                                                                                                                                        </mahapps:NumericUpDown.Resources>
+                                                                                                                                    </mahapps:NumericUpDown>
+                                                                                                                                </Border>
+
+                                                                                                                                <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Magenta">
+                                                                                                                                    <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Magenta, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown.Resources>
+                                                                                                                                            <Style TargetType="TextBox"/>
+                                                                                                                                        </mahapps:NumericUpDown.Resources>
+                                                                                                                                    </mahapps:NumericUpDown>
+                                                                                                                                </Border>
+
+                                                                                                                                <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Yellow">
+                                                                                                                                    <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Yellow, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown.Resources>
+                                                                                                                                            <Style TargetType="TextBox"/>
+                                                                                                                                        </mahapps:NumericUpDown.Resources>
+                                                                                                                                    </mahapps:NumericUpDown>
+                                                                                                                                </Border>
+
+                                                                                                                                <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Black">
+                                                                                                                                    <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Black, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown.Resources>
+                                                                                                                                            <Style TargetType="TextBox"/>
+                                                                                                                                        </mahapps:NumericUpDown.Resources>
+                                                                                                                                    </mahapps:NumericUpDown>
+                                                                                                                                </Border>
+
+                                                                                                                                <Rectangle Margin="30 0 0 0" Width="50" Height="50" StrokeThickness="1" Stroke="Gray">
+                                                                                                                                    <Rectangle.Fill>
+                                                                                                                                        <SolidColorBrush Color="{Binding Color}">
+                                                                                                                                        </SolidColorBrush>
+                                                                                                                                    </Rectangle.Fill>
+                                                                                                                                </Rectangle>
+                                                                                                                            </StackPanel>
+                                                                                                                        </Setter.Value>
+                                                                                                                    </Setter>
+                                                                                                                </DataTrigger>
+                                                                                                                <DataTrigger Binding="{Binding ColorSpace.Name}" Value="LAB">
+                                                                                                                    <Setter Property="Content">
+                                                                                                                        <Setter.Value>
+                                                                                                                            <StackPanel Orientation="Horizontal">
+                                                                                                                                <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Gray">
+                                                                                                                                    <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding L, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown.Resources>
+                                                                                                                                            <Style TargetType="TextBox"/>
+                                                                                                                                        </mahapps:NumericUpDown.Resources>
+                                                                                                                                    </mahapps:NumericUpDown>
+                                                                                                                                </Border>
+
+                                                                                                                                <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FF8A8A">
+                                                                                                                                    <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding A, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown.Resources>
+                                                                                                                                            <Style TargetType="TextBox"/>
+                                                                                                                                        </mahapps:NumericUpDown.Resources>
+                                                                                                                                    </mahapps:NumericUpDown>
+                                                                                                                                </Border>
+
+                                                                                                                                <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FFFF8A">
+                                                                                                                                    <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding B, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                                                                                                                        <mahapps:NumericUpDown.Resources>
+                                                                                                                                            <Style TargetType="TextBox"/>
+                                                                                                                                        </mahapps:NumericUpDown.Resources>
+                                                                                                                                    </mahapps:NumericUpDown>
+                                                                                                                                </Border>
+
+                                                                                                                                <Rectangle Margin="30 0 0 0" Width="50" Height="50" StrokeThickness="1" Stroke="Gray">
+                                                                                                                                    <Rectangle.Fill>
+                                                                                                                                        <SolidColorBrush Color="{Binding Color}">
+                                                                                                                                        </SolidColorBrush>
+                                                                                                                                    </Rectangle.Fill>
+                                                                                                                                </Rectangle>
+                                                                                                                            </StackPanel>
+                                                                                                                        </Setter.Value>
+                                                                                                                    </Setter>
+                                                                                                                </DataTrigger>
+                                                                                                            </Style.Triggers>
+                                                                                                        </Style>
+                                                                                                    </ContentControl.Style>
+                                                                                                </ContentControl>
+
+                                                                                                <Grid DockPanel.Dock="Right">
+                                                                                                    <Border Style="{StaticResource JobFieldBorder}">
+                                                                                                        <StackPanel Margin="5" Width="140">
+                                                                                                            <StackPanel Orientation="Horizontal">
+                                                                                                                <Image Source="../Images/colorspace.png" Width="24"></Image>
+                                                                                                                <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Color Space</TextBlock>
+                                                                                                            </StackPanel>
+                                                                                                            <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.Adapter.ColorSpaces}" SelectedItem="{Binding ColorSpace}" DisplayMemberPath="Name"></ComboBox>
+                                                                                                        </StackPanel>
+                                                                                                    </Border>
+                                                                                                </Grid>
+                                                                                                <Grid>
+                                                                                                    <StackPanel VerticalAlignment="Center">
+                                                                                                        <TextBlock Width="150" TextAlignment="Center" HorizontalAlignment="Center"><Run FontWeight="Bold" FontStyle="Italic" Text="OFFSET:"></Run> <Run FontFamily="digital-7" Text="{Binding OffsetPercent,StringFormat={}{0:F1}%}"></Run></TextBlock>
+                                                                                                        <Slider ValueChanged="Offset_Slider_ValueChanged" IsSnapToTickEnabled="True" TickFrequency="1" Margin="0 5 0 0" HorizontalAlignment="Center" Width="150" Value="{Binding OffsetPercent}">
+                                                                                                            <Slider.Minimum>
+                                                                                                                <MultiBinding Converter="{StaticResource BrushStopToOffsetLimitConverter}" ConverterParameter="min">
+                                                                                                                    <Binding Path="."></Binding>
+                                                                                                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl,Mode=FindAncestor}" Path="DataContext.SelectedSegment"></Binding>
+                                                                                                                    <Binding Path="StopIndex"></Binding>
+                                                                                                                </MultiBinding>
+                                                                                                            </Slider.Minimum>
+                                                                                                            <Slider.Maximum>
+                                                                                                                <MultiBinding Converter="{StaticResource BrushStopToOffsetLimitConverter}" ConverterParameter="max">
+                                                                                                                    <Binding Path="."></Binding>
+                                                                                                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl,Mode=FindAncestor}" Path="DataContext.SelectedSegment"></Binding>
+                                                                                                                </MultiBinding>
+                                                                                                            </Slider.Maximum>
+                                                                                                        </Slider>
+                                                                                                    </StackPanel>
+                                                                                                </Grid>
+                                                                                            </DockPanel>
+                                                                                        </Grid>
+                                                                                    </Border>
 
-                                                                        </Style>
-                                                                    </ListBox.ItemContainerStyle>
-                                                                    <ItemsControl.ItemTemplate>
-                                                                        <DataTemplate DataType="{x:Type observables:BrushStop}">
-
-                                                                            <Border BorderThickness="1" CornerRadius="5" Margin="0 0 0 5" Padding="10" Background="Transparent" dragAndDrop:DragAndDropService.Drop="OnBrushStopBorderDrop">
-                                                                                <Border.Style>
-                                                                                    <Style TargetType="Border" BasedOn="{StaticResource brushStopBorder}">
-                                                                                        <Setter Property="BorderBrush" Value="{StaticResource SideBarBackground}"></Setter>
-                                                                                        <Setter Property="Background" Value="White"></Setter>
-                                                                                        <Style.Triggers>
-                                                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
-                                                                                                <Setter Property="BorderBrush" Value="Gainsboro"></Setter>
-                                                                                                <Setter Property="Background" Value="{StaticResource SideBarBackground}"></Setter>
-                                                                                            </DataTrigger>
-                                                                                        </Style.Triggers>
-                                                                                    </Style>
-                                                                                </Border.Style>
-                                                                                <Grid>
-                                                                                    <DockPanel>
-                                                                                        <ContentControl DockPanel.Dock="Left">
-                                                                                            <ContentControl.Style>
-                                                                                                <Style TargetType="ContentControl">
-                                                                                                    <Setter Property="Content">
+                                                                                    <StackPanel>
+                                                                                        <Grid VerticalAlignment="Top">
+                                                                                            <Grid.Style>
+                                                                                                <Style TargetType="Grid">
+                                                                                                    <Setter Property="LayoutTransform">
                                                                                                         <Setter.Value>
-                                                                                                            <Rectangle/>
+                                                                                                            <ScaleTransform ScaleX="1" ScaleY="0" />
                                                                                                         </Setter.Value>
                                                                                                     </Setter>
                                                                                                     <Style.Triggers>
-                                                                                                        <DataTrigger Binding="{Binding ColorSpace.Name}" Value="Volume">
-                                                                                                            <Setter Property="Content">
-                                                                                                                <Setter.Value>
-                                                                                                                    <StackPanel VerticalAlignment="Center">
-                                                                                                                        <ItemsControl ItemsSource="{Binding InkVolumes}" VerticalAlignment="Center">
-                                                                                                                            <ItemsControl.ItemsPanel>
-                                                                                                                                <ItemsPanelTemplate>
-                                                                                                                                    <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
-                                                                                                                                </ItemsPanelTemplate>
-                                                                                                                            </ItemsControl.ItemsPanel>
-                                                                                                                            <ItemsControl.ItemTemplate>
-                                                                                                                                <DataTemplate>
-                                                                                                                                    <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0">
-                                                                                                                                        <Border.BorderBrush>
-                                                                                                                                            <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                                                                                                                                        </Border.BorderBrush>
-                                                                                                                                        <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                                                                                                            <mahapps:NumericUpDown.Resources>
-                                                                                                                                                <Style TargetType="TextBox"/>
-                                                                                                                                            </mahapps:NumericUpDown.Resources>
-                                                                                                                                        </mahapps:NumericUpDown>
-                                                                                                                                    </Border>
-                                                                                                                                </DataTemplate>
-                                                                                                                            </ItemsControl.ItemTemplate>
-                                                                                                                        </ItemsControl>
-                                                                                                                    </StackPanel>
-                                                                                                                </Setter.Value>
-                                                                                                            </Setter>
-                                                                                                        </DataTrigger>
-                                                                                                        <DataTrigger Binding="{Binding ColorSpace.Name}" Value="RGB">
-                                                                                                            <Setter Property="Content">
-                                                                                                                <Setter.Value>
-                                                                                                                    <StackPanel Orientation="Horizontal">
-                                                                                                                        <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FF6F6F">
-                                                                                                                            <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Red, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </Border>
-
-                                                                                                                        <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#92FF92">
-                                                                                                                            <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Green, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </Border>
-
-                                                                                                                        <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#3C7EF4">
-                                                                                                                            <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Blue, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="255" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="False" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </Border>
-
-                                                                                                                        <ContentControl Style="{StaticResource colorPicker}"></ContentControl>
-                                                                                                                    </StackPanel>
-                                                                                                                </Setter.Value>
-                                                                                                            </Setter>
-                                                                                                        </DataTrigger>
-                                                                                                        <DataTrigger Binding="{Binding ColorSpace.Name}" Value="CMYK">
-                                                                                                            <Setter Property="Content">
-                                                                                                                <Setter.Value>
-                                                                                                                    <StackPanel Orientation="Horizontal">
-                                                                                                                        <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Cyan">
-                                                                                                                            <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Cyan, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </Border>
-
-                                                                                                                        <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Magenta">
-                                                                                                                            <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Magenta, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </Border>
-
-                                                                                                                        <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Yellow">
-                                                                                                                            <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Yellow, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </Border>
-
-                                                                                                                        <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Black">
-                                                                                                                            <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding Black, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0" HideUpDownButtons="True" Minimum="0" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </Border>
-
-                                                                                                                        <Rectangle Margin="30 0 0 0" Width="50" Height="50" StrokeThickness="1" Stroke="Gray">
-                                                                                                                            <Rectangle.Fill>
-                                                                                                                                <SolidColorBrush Color="{Binding Color}">
-                                                                                                                                </SolidColorBrush>
-                                                                                                                            </Rectangle.Fill>
-                                                                                                                        </Rectangle>
-                                                                                                                    </StackPanel>
-                                                                                                                </Setter.Value>
-                                                                                                            </Setter>
-                                                                                                        </DataTrigger>
-                                                                                                        <DataTrigger Binding="{Binding ColorSpace.Name}" Value="LAB">
-                                                                                                            <Setter Property="Content">
-                                                                                                                <Setter.Value>
-                                                                                                                    <StackPanel Orientation="Horizontal">
-                                                                                                                        <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="Gray">
-                                                                                                                            <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding L, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </Border>
-
-                                                                                                                        <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FF8A8A">
-                                                                                                                            <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding A, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </Border>
-
-                                                                                                                        <Border BorderThickness="1" Width="50" Height="50" CornerRadius="50" Margin="10 0 0 0" BorderBrush="#FFFF8A">
-                                                                                                                            <mahapps:NumericUpDown FontSize="14" FontFamily="digital-7" HorizontalAlignment="Center" Value="{Binding B, Mode=TwoWay}" Background="Transparent" Width="40" StringFormat="0.0" HideUpDownButtons="True" Minimum="-100" Maximum="100" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                                                                                                <mahapps:NumericUpDown.Resources>
-                                                                                                                                    <Style TargetType="TextBox"/>
-                                                                                                                                </mahapps:NumericUpDown.Resources>
-                                                                                                                            </mahapps:NumericUpDown>
-                                                                                                                        </Border>
-
-                                                                                                                        <Rectangle Margin="30 0 0 0" Width="50" Height="50" StrokeThickness="1" Stroke="Gray">
-                                                                                                                            <Rectangle.Fill>
-                                                                                                                                <SolidColorBrush Color="{Binding Color}">
-                                                                                                                                </SolidColorBrush>
-                                                                                                                            </Rectangle.Fill>
-                                                                                                                        </Rectangle>
-                                                                                                                    </StackPanel>
-                                                                                                                </Setter.Value>
-                                                                                                            </Setter>
+                                                                                                        <DataTrigger Binding="{Binding ElementName=toggleExpand, Path=IsChecked}" Value="True">
+                                                                                                            <DataTrigger.EnterActions>
+                                                                                                                <BeginStoryboard>
+                                                                                                                    <Storyboard>
+                                                                                                                        <DoubleAnimation Storyboard.TargetProperty="LayoutTransform.ScaleY" To="1" Duration="00:00:0.2" />
+                                                                                                                    </Storyboard>
+                                                                                                                </BeginStoryboard>
+                                                                                                            </DataTrigger.EnterActions>
+                                                                                                            <DataTrigger.ExitActions>
+                                                                                                                <BeginStoryboard>
+                                                                                                                    <Storyboard>
+                                                                                                                        <DoubleAnimation Storyboard.TargetProperty="LayoutTransform.ScaleY" To="0" Duration="00:00:0.2" />
+                                                                                                                    </Storyboard>
+                                                                                                                </BeginStoryboard>
+                                                                                                            </DataTrigger.ExitActions>
                                                                                                         </DataTrigger>
                                                                                                     </Style.Triggers>
                                                                                                 </Style>
-                                                                                            </ContentControl.Style>
-                                                                                        </ContentControl>
-
-                                                                                        <Grid DockPanel.Dock="Right">
-                                                                                            <Border Style="{StaticResource JobFieldBorder}">
-                                                                                                <StackPanel Margin="5" Width="140">
-                                                                                                    <StackPanel Orientation="Horizontal">
-                                                                                                        <Image Source="../Images/colorspace.png" Width="24"></Image>
-                                                                                                        <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Color Space</TextBlock>
-                                                                                                    </StackPanel>
-                                                                                                    <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.Adapter.ColorSpaces}" SelectedItem="{Binding ColorSpace}" DisplayMemberPath="Name"></ComboBox>
-                                                                                                </StackPanel>
-                                                                                            </Border>
-                                                                                        </Grid>
-                                                                                        <Grid>
-                                                                                            <StackPanel VerticalAlignment="Center">
-                                                                                                <TextBlock Width="150" TextAlignment="Center" HorizontalAlignment="Center"><Run FontWeight="Bold" FontStyle="Italic" Text="OFFSET:"></Run> <Run FontFamily="digital-7" Text="{Binding OffsetPercent,StringFormat={}{0:F1}%}"></Run></TextBlock>
-                                                                                                <Slider ValueChanged="Offset_Slider_ValueChanged" IsSnapToTickEnabled="True" TickFrequency="1" Margin="0 5 0 0" HorizontalAlignment="Center" Width="150" Value="{Binding OffsetPercent}">
-                                                                                                    <Slider.Minimum>
-                                                                                                        <MultiBinding Converter="{StaticResource BrushStopToOffsetLimitConverter}" ConverterParameter="min">
-                                                                                                            <Binding Path="."></Binding>
-                                                                                                            <Binding RelativeSource="{RelativeSource AncestorType=UserControl,Mode=FindAncestor}" Path="DataContext.SelectedSegment"></Binding>
-                                                                                                            <Binding Path="StopIndex"></Binding>
-                                                                                                        </MultiBinding>
-                                                                                                    </Slider.Minimum>
-                                                                                                    <Slider.Maximum>
-                                                                                                        <MultiBinding Converter="{StaticResource BrushStopToOffsetLimitConverter}" ConverterParameter="max">
-                                                                                                            <Binding Path="."></Binding>
-                                                                                                            <Binding RelativeSource="{RelativeSource AncestorType=UserControl,Mode=FindAncestor}" Path="DataContext.SelectedSegment"></Binding>
-                                                                                                        </MultiBinding>
-                                                                                                    </Slider.Maximum>
-                                                                                                </Slider>
-                                                                                            </StackPanel>
+                                                                                            </Grid.Style>
+                                                                                            <Grid>
+                                                                                                <DataGrid ItemsSource="{Binding LiquidVolumes}" AutoGenerateColumns="False">
+                                                                                                    <DataGrid.Columns>
+                                                                                                        <DataGridTemplateColumn Header="IDS PACK">
+                                                                                                            <DataGridTemplateColumn.CellTemplate>
+                                                                                                                <DataTemplate>
+                                                                                                                    <Grid>
+                                                                                                                        <Polygon Points="0,0 20,0 0,20 0,0" Margin="-15 -11 0 0">
+                                                                                                                            <Polygon.Fill>
+                                                                                                                                <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}" />
+                                                                                                                            </Polygon.Fill>
+                                                                                                                        </Polygon>
+                                                                                                                        <TextBlock TextWrapping="Wrap" TextAlignment="Center" VerticalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}"></TextBlock>
+                                                                                                                    </Grid>
+                                                                                                                </DataTemplate>
+                                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                                        </DataGridTemplateColumn>
+                                                                                                        <DataGridTemplateColumn Header="DISPENSER NL / PULSE">
+                                                                                                            <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="LIQUID 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="NANOLITER / 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>
+                                                                                                                    <TextBlock VerticalAlignment="Center">
+                                                                                                                        <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
+                                                                                                                        <Run Text="(pulse)" FontSize="9" Foreground="Gray"></Run>
+                                                                                                                    </TextBlock>
+                                                                                                                </DataTemplate>
+                                                                                                            </DataGridTemplateColumn.CellTemplate>
+                                                                                                        </DataGridTemplateColumn>
+                                                                                                    </DataGrid.Columns>
+                                                                                                </DataGrid>
+                                                                                            </Grid>
                                                                                         </Grid>
-                                                                                    </DockPanel>
-                                                                                </Grid>
-                                                                            </Border>
+                                                                                        <ToggleButton Margin="5" x:Name="toggleExpand" Style="{StaticResource MaterialDesignFlatToggleButton}" ToolTip="View more" HorizontalAlignment="Right" Padding="0" Width="24" Height="24" VerticalContentAlignment="Center">
+                                                                                            <materialDesign:PackIcon VerticalAlignment="Center">
+                                                                                                <materialDesign:PackIcon.Style>
+                                                                                                    <Style TargetType="materialDesign:PackIcon">
+                                                                                                        <Setter Property="Kind" Value="ArrowDown"></Setter>
+                                                                                                        <Setter Property="Margin" Value="0"></Setter>
+                                                                                                        <Style.Triggers>
+                                                                                                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ToggleButton},Path=IsChecked}" Value="True">
+                                                                                                                <Setter Property="Kind" Value="ArrowUp"></Setter>
+                                                                                                            </DataTrigger>
+                                                                                                        </Style.Triggers>
+                                                                                                    </Style>
+                                                                                                </materialDesign:PackIcon.Style>
+                                                                                            </materialDesign:PackIcon>
+                                                                                        </ToggleButton>
+                                                                                    </StackPanel>
+                                                                                </StackPanel>
+                                                                            </DataTemplate>
+                                                                        </ItemsControl.ItemTemplate>
+                                                                    </ListBox>
+                                                                </Grid>
+                                                            </DockPanel>
+                                                        </Grid>
+                                                    </DockPanel>
+                                                </Grid>
+                                            </DockPanel>
+                                        </Grid>
+                                    </Grid>
 
-                                                                        </DataTemplate>
-                                                                    </ItemsControl.ItemTemplate>
-                                                                </ListBox>
-                                                            </Grid>
-                                                        </DockPanel>
-                                                    </Grid>
-                                                </DockPanel>
+                                    <Grid Height="60" Grid.Row="1">
+                                        <DockPanel>
+                                            <Grid DockPanel.Dock="Left">
+                                                <StackPanel HorizontalAlignment="Left" Margin="0 0 0 0">
+                                                    <TextBlock FontSize="14" Margin="0 20 0 0">
+                                                        <Run FontWeight="Bold">ESTIMATED DURATION:</Run>
+                                                        <Run FontSize="18" Foreground="{StaticResource AccentColorBrush}" FontStyle="Italic" FontFamily="digital-7">00:00:00</Run>
+                                                    </TextBlock>
+                                                </StackPanel>
+                                            </Grid>
+
+                                            <Grid DockPanel.Dock="Right">
+                                                <StackPanel Orientation="Horizontal">
+                                                    <Button Height="40" Width="170">
+                                                        <StackPanel Orientation="Horizontal">
+                                                            <materialDesign:PackIcon VerticalAlignment="Center" Width="24" Height="24" Kind="ClockFast" />
+                                                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">START</TextBlock>
+                                                        </StackPanel>
+                                                    </Button>
+                                                </StackPanel>
+                                            </Grid>
+
+                                            <Grid>
+                                                <Rectangle VerticalAlignment="Center" Height="10" Margin="20 0 20 0" Stroke="Gainsboro" StrokeThickness="1"></Rectangle>
                                             </Grid>
                                         </DockPanel>
                                     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs
index 52febe37b..c9796fbe2 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MainView.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using Tango.DAL.Observables;
+using Tango.Integration.Observables;
 using Tango.DragAndDrop;
 using Tango.MachineStudio.Developer.Converters;
 using Tango.MachineStudio.Developer.ViewModels;
-- 
cgit v1.3.1