From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Views/InsufficientLiquidQuantityView.xaml      |  67 ++----
 .../Views/InsufficientLiquidQuantityView.xaml.cs   |   6 +-
 .../Views/JobView.xaml                             | 227 +++++++++------------
 .../Views/JobView.xaml.cs                          |  45 +++-
 .../Views/MachineJobSelectionView.xaml             |   8 +-
 .../Views/MainView.xaml                            |  58 +++---
 .../Views/RunningJobView.xaml                      |   2 +-
 7 files changed, 180 insertions(+), 233 deletions(-)

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

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
index c0cb963e7..f0e9dc29c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml
@@ -5,10 +5,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels"
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
-             xmlns:material="http://materialdesigninxaml.net/winfx/xaml/themes"
              mc:Ignorable="d" 
-             Height="590" Width="800" d:DataContext="{d:DesignInstance Type=vm:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource Dialog.Foreground}" 
-             Background="{StaticResource Dialog.Background}">
+             Height="450" Width="800" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}">
     <Grid Margin="10">
         <DockPanel>
             <StackPanel DockPanel.Dock="Top">
@@ -25,60 +23,28 @@
                 <Button HorizontalAlignment="Right" DockPanel.Dock="Bottom" Height="40" Width="140" Command="{Binding CloseCommand}" Margin="10 0 0 0">CLOSE</Button>
             </Grid>
 
-            <Border Margin="0 20 0 0" Padding="10" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}" CornerRadius="3">
-                <ItemsControl ItemsSource="{Binding Exception.IdsPackLevels}" VerticalAlignment="Top">
+            <Border Margin="0 40 0 0" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}" CornerRadius="3">
+                <ItemsControl ItemsSource="{Binding Exception.IdsPackLevels}">
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Vertical" IsItemsHost="True"></StackPanel>
+                            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
                         </ItemsPanelTemplate>
                     </ItemsControl.ItemsPanel>
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Grid Margin="0 0 0 4">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="40" />
-                                    <ColumnDefinition Width="160" />
-                                    <ColumnDefinition Width="1*" />
-                                </Grid.ColumnDefinitions>
-                                <material:PackIcon  VerticalAlignment="Center" Width="24" Height="24">
-                                    <material:PackIcon.Style>
-                                        <Style TargetType="material:PackIcon">
-                                            <Setter Property="Kind" Value="Check"></Setter>
-                                            <Setter Property="Foreground" Value="{StaticResource GreenBrush100}"></Setter>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding IsValid}" Value="False">
-                                                    <Setter Property="Kind" Value="Alert"></Setter>
-                                                    <Setter Property="Foreground" Value="{StaticResource OrangeBrush}"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding IsOverMax}" Value="True">
-                                                    <Setter Property="Kind" Value="AlertOctagon"></Setter>
-                                                    <Setter Property="Foreground" Value="{StaticResource RedBrush100}"></Setter>
-                                                </DataTrigger>
-                                                <MultiDataTrigger>
-                                                    <MultiDataTrigger.Conditions>
-                                                        <Condition Binding="{Binding IsValid}" Value="True" />
-                                                        <Condition Binding="{Binding IsOverMax}" Value="False" />
-                                                    </MultiDataTrigger.Conditions>
-                                                    <Setter Property="Kind" Value="Check"></Setter>
-                                                    <Setter Property="Foreground" Value="{StaticResource GreenBrush100}"></Setter>
-                                                </MultiDataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </material:PackIcon.Style>
-                                </material:PackIcon>
-                                <!--<material:PackIcon Kind="AlertOctagon" VerticalAlignment="Center" Width="24" Height="24" Visibility="{Binding IsValid,Converter={StaticResource BoolToVisConverter}}" />-->
-
-                                <Border Grid.Column="1" Margin="5 0 0 0" Height="45" Width="150" CornerRadius="3" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}">
+                            <StackPanel Margin="15 0">
+                                <TextBlock HorizontalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}"></TextBlock>
+                                <Border Margin="0 5 0 0" Height="150" Width="50" CornerRadius="3" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}">
                                     <Grid>
-                                        <Border VerticalAlignment="Center" CornerRadius="3" Loaded="IdsPackLoaded" MinHeight="45" HorizontalAlignment="Left" MinWidth="5">
+                                        <Border CornerRadius="3" VerticalAlignment="Bottom" Loaded="IdsPackLoaded" MinHeight="5">
                                             <Border.Background>
-                                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                                <LinearGradientBrush>
+                                                    <GradientStop Offset="0" Color="#4DFFFFFF" />
                                                     <GradientStop Offset="0.5" Color="{Binding IdsPack.LiquidType.LiquidTypeColor}" />
-                                                    <GradientStop Offset="1" Color="#4EFFFFFF" />
                                                 </LinearGradientBrush>
                                             </Border.Background>
                                         </Border>
-                                        <Rectangle Loaded="Limit_Loaded" Stroke="Red" StrokeThickness="2" HorizontalAlignment="Left">
+                                        <Rectangle Loaded="Limit_Loaded" Stroke="Red" StrokeThickness="2" VerticalAlignment="Bottom">
                                             <Rectangle.Style>
                                                 <Style TargetType="Rectangle">
                                                     <Style.Triggers>
@@ -103,18 +69,9 @@
                                                 </Style>
                                             </Rectangle.Style>
                                         </Rectangle>
-
-                                        
-                                            <TextBlock Foreground="#3B3B3B" HorizontalAlignment="Center" Text="{Binding IdsPack.LiquidType.Name}" VerticalAlignment="Center">
-                                                <TextBlock.Effect>
-                                                    <DropShadowEffect ShadowDepth="1" BlurRadius="1" Color="White" />
-                                                </TextBlock.Effect>
-                                            </TextBlock>
-                                        
                                     </Grid>
                                 </Border>
-                                <TextBlock Grid.Column="2" HorizontalAlignment="Left" Text="{Binding Message}" VerticalAlignment="Center" Margin="20,0,0,0" TextWrapping="Wrap" Foreground="{StaticResource RedBrush100}"></TextBlock>
-                            </Grid>                                                                                                                                                                                                                        
+                            </StackPanel>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs
index 51cfb1e73..171cb754e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/InsufficientLiquidQuantityView.xaml.cs
@@ -33,7 +33,7 @@ namespace Tango.MachineStudio.Developer.Views
             Grid parent = border.Parent as Grid;
             IDSPackLevel packLevel = border.DataContext as IDSPackLevel;
 
-            border.Width = ((double)packLevel.Current / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualWidth;
+            border.Height = ((double)packLevel.Current / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight;
         }
 
         private void Limit_Loaded(object sender, RoutedEventArgs e)
@@ -42,8 +42,8 @@ namespace Tango.MachineStudio.Developer.Views
             Grid parent = rect.Parent as Grid;
             IDSPackLevel packLevel = rect.DataContext as IDSPackLevel;
 
-            var left = ((double)packLevel.Required / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualWidth;
-            rect.Margin = new Thickness(left, 0, 0, 0);
+            var top = ((double)packLevel.Required / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight;
+            rect.Margin = new Thickness(0, 0, 0, top);
 
             if (packLevel.IsValid)
             {
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 32b7ccd86..3bda86036 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -28,8 +28,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Tango.MachineStudio.Developer.Views"
              mc:Ignorable="d" 
-             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" 
-             DataContext="{x:Static global:ViewModelLocator.MainViewVM}" x:Name="control">
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" x:Name="control">
 
     <UserControl.Resources>
 
@@ -242,93 +241,91 @@
         </Style>
 
         <DataTemplate x:Key="Volume_Template">
-            <StackPanel>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                    <StackPanel VerticalAlignment="Center">
-                        <ItemsControl VerticalAlignment="Center">
-                            <ItemsControl.Style>
-                                <Style TargetType="ItemsControl">
-                                    <Setter Property="ItemsSource" Value="{Binding LiquidVolumes}"></Setter>
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.Settings.UsePreferredLiquidVolumeIndex}" Value="True">
-                                            <Setter Property="ItemsSource" Value="{Binding LiquidVolumesOrdered}"></Setter>
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </ItemsControl.Style>
-                            <ItemsControl.ItemsPanel>
-                                <ItemsPanelTemplate>
-                                    <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
-                                </ItemsPanelTemplate>
-                            </ItemsControl.ItemsPanel>
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate>
-                                    <Border>
-                                        <Border.Style>
-                                            <Style TargetType="Border">
-                                                <Setter Property="Visibility" Value="Visible"></Setter>
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding IdsPack.IdsPackFormula.Name}" Value="Lubricant">
-                                                        <Setter Property="Visibility" Value="Collapsed"></Setter>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </Border.Style>
-                                        <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="60" Height="60">
-                                            <ContentControl.Foreground>
-                                                <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                                            </ContentControl.Foreground>
-                                            <mahapps:NumericUpDown ValueChanged="OnBrushStopFieldValueChanged" FontSize="{StaticResource NumbersFontSize}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                                <mahapps:NumericUpDown.Resources>
-                                                    <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
-                                                </mahapps:NumericUpDown.Resources>
-                                            </mahapps:NumericUpDown>
-                                        </ContentControl>
-                                    </Border>
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                <StackPanel VerticalAlignment="Center">
+                    <ItemsControl VerticalAlignment="Center">
+                        <ItemsControl.Style>
+                            <Style TargetType="ItemsControl">
+                                <Setter Property="ItemsSource" Value="{Binding LiquidVolumes}"></Setter>
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.Settings.UsePreferredLiquidVolumeIndex}" Value="True">
+                                        <Setter Property="ItemsSource" Value="{Binding LiquidVolumesOrdered}"></Setter>
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </ItemsControl.Style>
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Border>
+                                    <Border.Style>
+                                        <Style TargetType="Border">
+                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding IdsPack.IdsPackFormula.Name}" Value="Lubricant">
+                                                    <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </Border.Style>
+                                    <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="60" Height="60">
+                                        <ContentControl.Foreground>
+                                            <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                        </ContentControl.Foreground>
+                                        <mahapps:NumericUpDown ValueChanged="OnBrushStopFieldValueChanged" FontSize="{StaticResource NumbersFontSize}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                                            <mahapps:NumericUpDown.Resources>
+                                                <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
+                                            </mahapps:NumericUpDown.Resources>
+                                        </mahapps:NumericUpDown>
+                                    </ContentControl>
+                                </Border>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+
+                    <StackPanel Orientation="Horizontal" Margin="30 10 0 0" Height="16" Visibility="{Binding IsLiquidVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource OrangeBrush}" />
+                        <TextBlock Margin="5 0 0 0" Foreground="{StaticResource OrangeBrush}">Liquid volumes exceeds the maximum range for color conversion!</TextBlock>
                     </StackPanel>
+                </StackPanel>
 
-                    <materialDesign:PackIcon Kind="ChevronDoubleLeft" Margin="40 2 0 0" VerticalAlignment="Center" Foreground="Gray" />
+                <materialDesign:PackIcon Kind="ChevronDoubleLeft" Margin="40 2 0 0" VerticalAlignment="Center" Foreground="Gray" />
 
-                    <TextBlock VerticalAlignment="Center" FontSize="16" Margin="5 0 0 0" FontStyle="Italic" Foreground="Gray">
+                <TextBlock VerticalAlignment="Center" FontSize="16" Margin="5 0 0 0" FontStyle="Italic" Foreground="Gray">
                                                                                                                             <Run>Total:</Run>
                                                                                                                             <Run Text="{Binding TotalLiquidVolume,Mode=OneWay,StringFormat=0}"></Run><Run>%</Run>
                                                                                                                             <Run>(</Run>
                                                                                                                             <Run FontSize="10" Text="{Binding TotalLiquidNanoliterPerCentimeter,Mode=OneWay,StringFormat=0.00}"></Run>
                                                                                                                             <Run FontSize="12">nl</Run>
                                                                                                                             <Run>)</Run>
-                    </TextBlock>
+                </TextBlock>
 
-                    <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" BorderBrush="{StaticResource WhiteBrush100}" BorderThickness="1 0 0 0">
-                        <Border.Style>
-                            <Style TargetType="Border">
-                                <Setter Property="Visibility" Value="Collapsed"></Setter>
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding Converter={StaticResource NullObjectToBooleanConverter}}" Value="True">
-                                        <Setter Property="Visibility" Value="Visible"></Setter>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Border.Style>
-                        <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="55" Height="55">
-                            <ContentControl.Foreground>
-                                <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
-                            </ContentControl.Foreground>
-                            <mahapps:NumericUpDown Foreground="{StaticResource GrayBrush250}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontSize="20" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
-                                <mahapps:NumericUpDown.Resources>
-                                    <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
-                                </mahapps:NumericUpDown.Resources>
-                            </mahapps:NumericUpDown>
-                        </ContentControl>
-                    </Border>
-                </StackPanel>
-
-                <StackPanel Orientation="Horizontal" Margin="30 10 0 0" Height="16" Visibility="{Binding IsLiquidVolumesOutOfRange,Converter={StaticResource BooleanToVisibilityConverter}}">
-                    <materialDesign:PackIcon Kind="Alert" Foreground="{StaticResource OrangeBrush}" />
-                    <TextBlock Margin="5 0 0 0" Foreground="{StaticResource OrangeBrush}">Liquid volumes exceeds the maximum range for color conversion!</TextBlock>
-                </StackPanel>
+                <Border Margin="60 0 0 0" DataContext="{Binding LiquidVolumes,Converter={StaticResource LiquidVolumesToLubricantLiquidVolume}}" BorderBrush="{StaticResource WhiteBrush100}" BorderThickness="1 0 0 0">
+                    <Border.Style>
+                        <Style TargetType="Border">
+                            <Setter Property="Visibility" Value="Collapsed"></Setter>
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Converter={StaticResource NullObjectToBooleanConverter}}" Value="True">
+                                    <Setter Property="Visibility" Value="Visible"></Setter>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Border.Style>
+                    <ContentControl Focusable="False" Style="{StaticResource numberBorder}" Margin="10 0 0 0" Width="55" Height="55">
+                        <ContentControl.Foreground>
+                            <SolidColorBrush Color="{Binding IdsPack.LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                        </ContentControl.Foreground>
+                        <mahapps:NumericUpDown Foreground="{StaticResource GrayBrush250}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" FontSize="20" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Value="{Binding Volume, Mode=TwoWay}" Background="Transparent" Width="40" HideUpDownButtons="True" Minimum="0" Maximum="1000" InterceptArrowKeys="True" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Center">
+                            <mahapps:NumericUpDown.Resources>
+                                <StaticResource ResourceKey="SelectAllTextBoxResource"></StaticResource>
+                            </mahapps:NumericUpDown.Resources>
+                        </mahapps:NumericUpDown>
+                    </ContentControl>
+                </Border>
             </StackPanel>
         </DataTemplate>
 
@@ -680,7 +677,7 @@
                                         </StackPanel>
                                     </Border>
 
-                                    <Border Style="{StaticResource JobFieldBorder}" Visibility="{Binding IsSideBarOpened,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                    <Border Style="{StaticResource JobFieldBorder}">
                                         <StackPanel Margin="20 5 5 5"  Width="140">
                                             <StackPanel Orientation="Horizontal">
                                                 <Image Source="../Images/repeat.png" Width="32"></Image>
@@ -756,7 +753,7 @@
                                                                 <StackPanel>
                                                                     <TextBlock>MEDIA</TextBlock>
                                                                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                                                                        <controls:SearchComboBox Width="250"  ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}"  HorizontalContentAlignment="Stretch" SearchProperty="Name">
+                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}" HorizontalContentAlignment="Stretch">
                                                                             <ComboBox.ItemTemplate>
                                                                                 <DataTemplate>
                                                                                     <DockPanel>
@@ -771,7 +768,7 @@
                                                                                     </DockPanel>
                                                                                 </DataTemplate>
                                                                             </ComboBox.ItemTemplate>
-                                                                        </controls:SearchComboBox>
+                                                                        </ComboBox>
 
                                                                         <!--<Button  Margin="20 30 0 0" Command="{Binding EditRMLCommand}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}">
                                                                             <StackPanel Orientation="Horizontal">
@@ -792,9 +789,9 @@
 
                                                         </StackPanel>
 
-                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="60 40 180 0" Visibility="{Binding IsSideBarOpened,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 40 180 0">
                                                             <materialDesign:PackIcon Kind="ChevronLeft" Width="24" Height="24" />
-                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>MEDIA LIQUIDS</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
+                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>SUPPORTED MEDIA LIQUID</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
                                                             <materialDesign:PackIcon Kind="ChevronRight" Width="24" Height="24" />
                                                         </StackPanel>
 
@@ -898,7 +895,7 @@
                                                             </DockPanel>
                                                         </Grid>
                                                         <Grid Margin="0 10 10 0">
-                                                            <controls:MultiSelectListBox x:Name="listStops" ScrollViewer.HorizontalScrollBarVisibility="Disabled" AutomationProperties.AutomationId="{x:Static automation:Developer.BrushStopsListBox}" SelectionMode="Extended" Style="{x:Null}" Background="Transparent" ScrollViewer.CanContentScroll="False" BorderThickness="0" ItemsSource="{Binding BrushStopsCollectionView}" SelectedItem="{Binding SelectedBrushStop}" SelectedItemsList="{Binding SelectedBrushStops,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
+                                                            <controls:MultiSelectListBox x:Name="listStops" AutomationProperties.AutomationId="{x:Static automation:Developer.BrushStopsListBox}" SelectionMode="Extended" Style="{x:Null}" Background="Transparent" ScrollViewer.CanContentScroll="False" BorderThickness="0" ItemsSource="{Binding BrushStopsCollectionView}" SelectedItem="{Binding SelectedBrushStop}" SelectedItemsList="{Binding SelectedBrushStops,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
                                                                 <ListBox.Template>
                                                                     <ControlTemplate TargetType="{x:Type ListBox}">
                                                                         <Border x:Name="Bd" SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}"
@@ -976,8 +973,7 @@
                                                                                                         <Image Source="../Images/colorspace.png" Width="24"></Image>
                                                                                                         <TextBlock VerticalAlignment="Center" Margin="5 0 0 0" FontSize="10">Color Space</TextBlock>
                                                                                                     </StackPanel>
-                                                                                                    <ComboBox SelectionChanged="OnBrushStopColorSpace_SelectionChanged" ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ColorSpaces}" SelectedItem="{Binding ColorSpace}" DisplayMemberPath="Name" Width="100" HorizontalAlignment="Left"
-                                                                                                              Style="{StaticResource TransparentComboBoxStyle}" >
+                                                                                                    <ComboBox ItemsSource="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ColorSpaces}" SelectedItem="{Binding ColorSpace}" DisplayMemberPath="Name" Width="100" HorizontalAlignment="Left">
                                                                                                         <ComboBox.ItemContainerStyle>
                                                                                                             <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
                                                                                                                 <Setter Property="Background" Value="{StaticResource WhiteBrush100}"></Setter>
@@ -1183,41 +1179,6 @@
                                                                                                                             </DataGridTemplateColumn.CellTemplate>
                                                                                                                         </DataGridTemplateColumn>
                                                                                                                         <DataGridTemplateColumn Header="PULSE / SEC">
-                                                                                                                            <DataGridTemplateColumn.CellTemplate>
-                                                                                                                                <DataTemplate>
-                                                                                                                                    <Label VerticalAlignment="Center">
-                                                                                                                                        <Label.Style>
-                                                                                                                                            <Style TargetType="Label">
-                                                                                                                                                <Setter Property="Content">
-                                                                                                                                                    <Setter.Value>
-                                                                                                                                                        <TextBlock>
-                                                                                                                                                 <Run Text="{Binding PulsePerSecondFull,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
-                                                                                                                                                        </TextBlock>
-                                                                                                                                                    </Setter.Value>
-                                                                                                                                                </Setter>
-                                                                                                                                                <Style.Triggers>
-                                                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision}" Value="{x:Static dispensing:DispenserStepDivisions.Auto}">
-                                                                                                                                                        <Setter Property="Content" Value="Auto"></Setter>
-                                                                                                                                                    </DataTrigger>
-                                                                                                                                                    <DataTrigger Binding="{Binding DispenserStepDivision,Converter={StaticResource IsNotConverter},ConverterParameter={x:Static dispensing:DispenserStepDivisions.Auto}}" Value="True">
-                                                                                                                                                        <Setter Property="Content">
-                                                                                                                                                            <Setter.Value>
-                                                                                                                                                                <TextBlock>
-                                                                                                                                                 <Run Text="{Binding PulsePerSecondFull,Mode=OneWay,StringFormat='0.0'}"></Run>
-                                                                                                                                                 <Run Text="(pulse)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
-                                                                                                                                                                </TextBlock>
-                                                                                                                                                            </Setter.Value>
-                                                                                                                                                        </Setter>
-                                                                                                                                                    </DataTrigger>
-                                                                                                                                                </Style.Triggers>
-                                                                                                                                            </Style>
-                                                                                                                                        </Label.Style>
-                                                                                                                                    </Label>
-                                                                                                                                </DataTemplate>
-                                                                                                                            </DataGridTemplateColumn.CellTemplate>
-                                                                                                                        </DataGridTemplateColumn>
-                                                                                                                        <DataGridTemplateColumn Header="PULSE / SEC (full step)">
                                                                                                                             <DataGridTemplateColumn.CellTemplate>
                                                                                                                                 <DataTemplate>
                                                                                                                                     <Label VerticalAlignment="Center">
@@ -1405,7 +1366,7 @@
                 <Grid Background="{StaticResource TransparentBackgroundBrush100}">
                     <Grid.Style>
                         <Style TargetType="Grid">
-                            <Setter Property="Width" Value="640"></Setter>
+                            <Setter Property="Width" Value="520"></Setter>
                             <Setter Property="LayoutTransform">
                                 <Setter.Value>
                                     <ScaleTransform ScaleY="1" ScaleX="0"></ScaleTransform>
@@ -1520,7 +1481,7 @@
                                                                                     <Setter Property="Template">
                                                                                         <Setter.Value>
                                                                                             <ControlTemplate TargetType="ContentControl">
-                                                                                                <Grid Width="97" ToolTip="{Binding Name}" Background="Transparent" ToolTipService.InitialShowDelay="1000" ToolTipService.BetweenShowDelay="1000">
+                                                                                                <Grid Width="97">
                                                                                                     <Border>
                                                                                                         <Border.Style>
                                                                                                             <Style TargetType="Border">
@@ -1543,7 +1504,7 @@
 
 
                                                                             </WrapPanel.Resources>
-                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}">
+                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}" GeneratingItems="ParameterizedEditor_GeneratingItems">
                                                                                 <editors:ParameterizedEditor.ItemsPanel>
                                                                                     <ItemsPanelTemplate>
                                                                                         <WrapPanel IsItemsHost="True" Orientation="Horizontal" />
@@ -1551,11 +1512,11 @@
                                                                                 </editors:ParameterizedEditor.ItemsPanel>
                                                                                 <editors:ParameterizedEditor.DoubleTemplate>
                                                                                     <DataTemplate>
-                                                                                        <Grid Background="Transparent">
+                                                                                        <Grid Background="Transparent" Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessParameterDropped" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=editors:ParameterizedEditor},Path=DraggingSurface}">
                                                                                             <ContentControl>
                                                                                                 <StackPanel>
-                                                                                                    <TextBlock ToolTip="{Binding Name}" IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
-                                                                                                    <mahapps:NumericUpDown FontSize="20" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="{Binding StringFormat}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}" Foreground="{StaticResource MainWindow.Foreground}"></mahapps:NumericUpDown>
+                                                                                                    <TextBlock IsHitTestVisible="False" Margin="0 5 0 5" Text="{Binding Name}" FontSize="11" Foreground="{StaticResource MainWindow.Foreground}"></TextBlock>
+                                                                                                    <mahapps:NumericUpDown FontSize="20" Minimum="0" Margin="0 0 5 0" HideUpDownButtons="True" HorizontalContentAlignment="Center" Maximum="10000" StringFormat="0.0" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" Value="{Binding Value,Mode=TwoWay}" Foreground="{StaticResource MainWindow.Foreground}"></mahapps:NumericUpDown>
                                                                                                 </StackPanel>
                                                                                             </ContentControl>
                                                                                         </Grid>
@@ -1611,17 +1572,16 @@
 
                                                 <StackPanel Orientation="Horizontal">
                                                     <ToggleButton IsChecked="{Binding AutoProcessSelection}" />
-                                                    <TextBlock Margin="5 3 0 0">Use Recommended Process Parameters (auto)</TextBlock>
+                                                    <TextBlock Margin="5 0 0 0">Use Recommended Process Parameters (auto)</TextBlock>
                                                 </StackPanel>
 
-                                                <Grid Margin="0 40 0 0" >
-                                                    <Button HorizontalAlignment="Left" Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush200}" Foreground="{StaticResource DarkGrayBrush200}" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
+                                                <StackPanel Margin="0 40 0 0" Orientation="Horizontal" HorizontalAlignment="Right">
+                                                    <Button Height="40" Width="105" Command="{Binding ResetProcessParametersCommand}" Background="Transparent" BorderBrush="{StaticResource DarkGrayBrush200}" Foreground="{StaticResource DarkGrayBrush200}" Margin="0 2 10 0" ToolTip="Resets the current process parameters in the embedded device">
                                                         <TextBlock TextWrapping="Wrap" TextAlignment="Center">
                                                         TEMP OFF
                                                         </TextBlock>
                                                     </Button>
-                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
-                                                        <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
+                                                    <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
                                                         <StackPanel Orientation="Horizontal">
                                                             <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentSave"></materialDesign:PackIcon>
                                                             <TextBlock Margin="10 0 0 0">SAVE PARAMETERS</TextBlock>
@@ -1634,7 +1594,6 @@
                                                         </StackPanel>
                                                     </Button>
                                                 </StackPanel>
-                                                </Grid>
                                             </StackPanel>
                                         </StackPanel>
                                     </Grid>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index 94c1ed802..28e488aae 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -159,6 +159,46 @@ namespace Tango.MachineStudio.Developer.Views
             e.Handled = true;
         }
 
+        private void ParameterizedEditor_GeneratingItems(object sender, SharedUI.Editors.ParameterizedEditor.GeneratingItemsEventArgs e)
+        {
+            var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
+
+            List<ParameterItem> items = e.Result.ToList();
+
+            if (settings.ProcessParametersIndices.Count > 0)
+            {
+                items.Clear();
+
+                foreach (var item in settings.ProcessParametersIndices.OrderBy(x => x.Index))
+                {
+                    var p = e.Source.SingleOrDefault(x => x.Name == item.Name);
+
+                    if (p != null)
+                    {
+                        items.Add(p);
+                    }
+                }
+            }
+            else
+            {
+                ProcessParametersTable p = new ProcessParametersTable();
+                var pp = p.CreateParametersCollection(Core.ParameterItemMode.Binding);
+
+                foreach (var item in pp)
+                {
+                    settings.ProcessParametersIndices.Add(new ParameterIndex()
+                    {
+                        Index = pp.IndexOf(item),
+                        Name = item.Name
+                    });
+                }
+
+                settings.Save();
+            }
+
+            e.Result = items;
+        }
+
         private void OnProcessParameterDropped(object sender, DropEventArgs e)
         {
             ParameterItem draggedItem = e.Draggable.DataContext as ParameterItem;
@@ -281,10 +321,5 @@ namespace Tango.MachineStudio.Developer.Views
         {
             listStops.SelectedItem = (sender as ListBoxItem).DataContext;
         }
-
-        private void OnBrushStopColorSpace_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            _vm.OnBrushStopColorSpaceChanged((sender as ComboBox).DataContext as BrushStop);
-        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
index a3d2dbd68..f8a10e7c4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
@@ -64,7 +64,7 @@
                         <Grid DockPanel.Dock="Top">
                             <StackPanel>
                                 <StackPanel Orientation="Horizontal">
-                                    <Image Source="{StaticResource MachineSmall}" RenderOptions.BitmapScalingMode="Fant" Width="50"></Image>
+                                    <Image Source="../Images/machine-trans.png" RenderOptions.BitmapScalingMode="Fant" Width="50"></Image>
                                     <TextBlock VerticalAlignment="Center" FontWeight="SemiBold" Margin="30 0 0 0" FontSize="30" FontStyle="Italic">MACHINE JOBS</TextBlock>
                                 </StackPanel>
                                 <Rectangle HorizontalAlignment="Stretch" Margin="0 10 0 0" VerticalAlignment="Bottom" StrokeThickness="1" Height="3">
@@ -125,7 +125,7 @@
 
                         <Grid Margin="0 20 0 0">
                             <commonControls:LoadingPanel IsLoading="{Binding CanWork,Converter={StaticResource BooleanInverseConverter}}">
-                                <controls:MultiSelectDataGrid DoubleClickCommand="{Binding LoadJobCommand}" AutomationProperties.AutomationId="{x:Static automation:Developer.JobsDataGrid}" Style="{StaticResource {x:Type DataGrid}}" CanUserAddRows="False" CanUserDeleteRows="False" CanUserResizeColumns="True" CanUserSortColumns="True" AutoGenerateColumns="False" Background="Transparent" ItemsSource="{Binding JobsCollectionView}" SelectedItem="{Binding SelectedMachineJob}" SelectedItemsList="{Binding SelectedJobs,Mode=TwoWay}">
+                                <controls:MultiSelectDataGrid MouseDoubleClick="MultiSelectDataGrid_MouseDoubleClick" AutomationProperties.AutomationId="{x:Static automation:Developer.JobsDataGrid}" Style="{StaticResource {x:Type DataGrid}}" CanUserAddRows="False" CanUserDeleteRows="False" CanUserResizeColumns="True" CanUserSortColumns="True" AutoGenerateColumns="False" Background="Transparent" ItemsSource="{Binding JobsCollectionView}" SelectedItem="{Binding SelectedMachineJob}" SelectedItemsList="{Binding SelectedJobs,Mode=TwoWay}">
                                     <DataGrid.CellStyle>
                                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
                                             <Setter Property="BorderThickness" Value="0"/>
@@ -190,10 +190,10 @@
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
-                                        <DataGridTemplateColumn Header="CREATED BY" Width="100" CanUserSort="True" SortMemberPath="User.Contact.FirstName">
+                                        <DataGridTemplateColumn Header="CREATED BY" Width="100" CanUserSort="True" SortMemberPath="User">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
-                                                    <TextBlock Text="{Binding User.Contact.FirstName,TargetNullValue='PPC',FallbackValue='PPC'}" VerticalAlignment="Center" FontSize="14"></TextBlock>
+                                                    <TextBlock Text="{Binding User.Contact.FirstName}" VerticalAlignment="Center" FontSize="14"></TextBlock>
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
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 d0caa2447..abea6aec9 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
@@ -330,36 +330,31 @@
                                                                     <Rectangle Height="30" Margin="0 10 0 0" VerticalAlignment="Center" Fill="{Binding SegmentBrush}">
                                                                     </Rectangle>
 
-
-                                                                    <Grid Height="30">
-                                                                        <TextBlock   Visibility="{Binding RelativeSource={RelativeSource AncestorType=UserControl}, Path=DataContext.RunningJobStatus.IsFinalizing, Converter={StaticResource BooleanToVisibilityConverter}}" VerticalAlignment="Center"  Background="Transparent" FontSize="12"  Foreground="{StaticResource RedBrush100}">Finalizing...</TextBlock>
-                                                                        <Canvas   Height="30" HorizontalAlignment="Center" Width="80">
-                                                                            <Label Padding="0" Margin="0">
-                                                                                <Label.Style>
-                                                                                    <Style TargetType="Label">
-                                                                                        <Setter Property="Content" Value="{x:Null}"></Setter>
-                                                                                        <Style.Triggers>
-                                                                                            <DataTrigger Binding="{Binding Started}" Value="True">
-                                                                                                <Setter Property="Content">
-                                                                                                    <Setter.Value>
-                                                                                                        <TextBlock Text="{Binding RemainingTime,StringFormat=hh\\:mm\\:ss}" Foreground="{StaticResource RedBrush300}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Margin="10" FontSize="20"></TextBlock>
-                                                                                                    </Setter.Value>
-                                                                                                </Setter>
-                                                                                            </DataTrigger>
-                                                                                            <DataTrigger Binding="{Binding Completed}" Value="True">
-                                                                                                <Setter Property="Content">
-                                                                                                    <Setter.Value>
-                                                                                                        <materialDesign:PackIcon Margin="30 10 0 0" HorizontalAlignment="Center" Width="24" Height="24" Kind="Check" Foreground="#47FF00" />
-                                                                                                    </Setter.Value>
-                                                                                                </Setter>
-                                                                                            </DataTrigger>
-                                                                                        </Style.Triggers>
-                                                                                    </Style>
-                                                                                </Label.Style>
-                                                                            </Label>
-                                                                        </Canvas>
-                                                                    </Grid>
-
+                                                                    <Canvas Height="30" HorizontalAlignment="Center" Width="80">
+                                                                        <Label Padding="0" Margin="0">
+                                                                            <Label.Style>
+                                                                                <Style TargetType="Label">
+                                                                                    <Setter Property="Content" Value="{x:Null}"></Setter>
+                                                                                    <Style.Triggers>
+                                                                                        <DataTrigger Binding="{Binding Started}" Value="True">
+                                                                                            <Setter Property="Content">
+                                                                                                <Setter.Value>
+                                                                                                    <TextBlock Text="{Binding RemainingTime,StringFormat=hh\\:mm\\:ss}" Foreground="{StaticResource RedBrush300}" FontFamily="{StaticResource digital-7}" HorizontalAlignment="Center" Margin="10" FontSize="20"></TextBlock>
+                                                                                                </Setter.Value>
+                                                                                            </Setter>
+                                                                                        </DataTrigger>
+                                                                                        <DataTrigger Binding="{Binding Completed}" Value="True">
+                                                                                            <Setter Property="Content">
+                                                                                                <Setter.Value>
+                                                                                                    <materialDesign:PackIcon Margin="30 10 0 0" HorizontalAlignment="Center" Width="24" Height="24" Kind="Check" Foreground="#47FF00" />
+                                                                                                </Setter.Value>
+                                                                                            </Setter>
+                                                                                        </DataTrigger>
+                                                                                    </Style.Triggers>
+                                                                                </Style>
+                                                                            </Label.Style>
+                                                                        </Label>
+                                                                    </Canvas>
                                                                 </StackPanel>
 
                                                                 <Rectangle HorizontalAlignment="Right" Stroke="White" Margin="0 35 0 25" ></Rectangle>
@@ -413,7 +408,8 @@
                                 </Grid>
                             </DockPanel>
 
-                              </Grid>
+                            <TextBlock Visibility="{Binding RunningJobStatus.IsFinalizing,Converter={StaticResource BooleanToVisibilityConverter}}" VerticalAlignment="Top" HorizontalAlignment="Center" Margin="-170 0 0 0" Background="{StaticResource DarkGrayBrush}" FontSize="14" Height="30" Foreground="{StaticResource RedBrush100}">Finalizing...</TextBlock>
+                        </Grid>
                     </Border>
 
                     <ProgressBar IsIndeterminate="True" VerticalAlignment="Bottom" Height="3" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityConverter}}"></ProgressBar>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
index 0400ee7e6..e7f16146b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/RunningJobView.xaml
@@ -208,7 +208,7 @@
             </Grid>
         </Grid>
 
-        <Grid HorizontalAlignment="Right" Margin="0 0 0 82">
+        <Grid HorizontalAlignment="Right">
             <ContentControl Content="{Binding}">
                 <ContentControl.Style>
                     <Style TargetType="ContentControl">
-- 
cgit v1.3.1