Merged PR 6: Revert "Hope it is fine"

Revert "Hope it is fine"

Reverted commit `1344a54c`.

9 files changed, 478 insertions, 305 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs
index ee570ac34..68dc7e3bf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Controls/JobOutlineControl.cs
@@ -136,6 +136,34 @@ namespace Tango.MachineStudio.Developer.Controls
                     _sizeControl.Height += NORMAL_FONT_HEIGHT;
                 }
             }
+            //JobTicket.ThreadParameters
+            if (job.ThreadParameters != null)
+            {
+                _sizeControl.Height += 20;
+                DrawHeaderText(drawingContext, "THREAD PARAMETERS", 17, LevelOffset.level_0);
+                _sizeControl.Height += TITLE_FONT_HEIGHT;
+                _sizeControl.Height += 5.0;
+                basicProps = GetNameValueList(job.ThreadParameters);
+                foreach (var prop in basicProps)
+                {
+                    DrawNameValueText(drawingContext, prop, LevelOffset.level_1, PackIconKind.Settings);
+                    _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                }
+            }
+            //JobTicket.HeadCleaningParameters
+            if (job.HeadCleaningParameters != null)
+            {
+                _sizeControl.Height += 20;
+                DrawHeaderText(drawingContext, "HEAD CLEANING PARAMETERS", 17, LevelOffset.level_0);
+                _sizeControl.Height += TITLE_FONT_HEIGHT;
+                _sizeControl.Height += 5.0;
+                basicProps = GetNameValueList(job.HeadCleaningParameters);
+                foreach (var prop in basicProps)
+                {
+                    DrawNameValueText(drawingContext, prop, LevelOffset.level_1, PackIconKind.Settings);
+                    _sizeControl.Height += NORMAL_FONT_HEIGHT;
+                }
+            }
             //JobTicket.Segments
             if (job.Segments != null)
             {
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 3a1f3fb11..fc0680d9c 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
@@ -50,6 +50,9 @@ using Tango.Core.ExtensionMethods;
 using Tango.ColorConversion;
 using Tango.PMR.Exports;
 using Microsoft.WindowsAPICodePack.Dialogs;
+using Tango.BL.Enumerations;
+using Tango.BL.DTO;
+using Tango.BL.ActionLogs;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -85,6 +88,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
         private TaskItem _preparingTaskItem;
         private IColorConverter _converter;
         private string _current_job_string;
+        private JobDTO _beforeSaveJobDTO;
+        private IActionLogManager _actionLogManager;
+        private RmlDTO _selectedRMLBeforeLiquidFactorsSaves;
 
         #region Properties
 
@@ -747,7 +753,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// </summary>
         /// <param name="applicationManager">The application manager.</param>
         /// <param name="notificationProvider">The notification provider.</param>
-        public MainViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IDiagnosticsFrameProvider diagnosticsFrameProvider, IVideoCaptureProvider videoCaptureProvider, DeveloperNavigationManager navigation, INavigationManager navigationManager, IAuthenticationProvider authentication, IEventLogger eventLogger, ISpeechProvider speech)
+        public MainViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IDiagnosticsFrameProvider diagnosticsFrameProvider, IVideoCaptureProvider videoCaptureProvider, DeveloperNavigationManager navigation, INavigationManager navigationManager, IAuthenticationProvider authentication, IEventLogger eventLogger, ISpeechProvider speech, IActionLogManager actionLogManager)
         {
             _converter = new DefaultColorConverter();
 
@@ -756,6 +762,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
             AuthenticationProvider = authentication;
 
+            _actionLogManager = actionLogManager;
             _notification = notificationProvider;
             _speech = speech;
             _navigation = navigation;
@@ -873,7 +880,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                         foreach (var stop in stops)
                         {
-                            if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.Volume.ToInt32() && !stop.IsLiquidVolumesOutOfRange)
+                            if (stop.ColorSpace.Code == BL.Enumerations.ColorSpaces.Volume.ToInt32())
                             {
                                 try
                                 {
@@ -1034,6 +1041,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             var percent = (e.Progress / e.Total * 100d);
 
+            if (_preparingTaskItem != null)
+            {
+                _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
+            }
+
             if (_preparingTaskItem == null && percent == 0)
             {
                 _preparingTaskItem = _notification.PushTaskItem("Preparing job for printing...");
@@ -1043,13 +1055,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 _preparingTaskItem.Pop();
                 _preparingTaskItem = null;
             }
-            else
-            {
-                if (_preparingTaskItem != null)
-                {
-                    _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
-                }
-            }
         }
 
         private void MachineOperator_ResumingJob(object sender, ResumingJobEventArgs e)
@@ -1252,7 +1257,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 ||
                 j.Name.ToLower().Contains(filter) //Job name
                 ||
-                j.User.Contact.FirstName.ToLower().Contains(filter) // User first name
+                (j.User != null && j.User.Contact.FirstName.ToLower().Contains(filter)) // User first name
                 ||
                 j.Length.ToString().Contains(filter); //Job length
             };
@@ -1371,7 +1376,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// <summary>
         /// Starts the job.
         /// </summary>
-        private async void StartJob(Func<Job, JobHandler> resumeFunc = null)
+        private async void StartJob(Func<JobHandler> resumeFunc = null)
         {
             SettingsManager.Default.Save();
 
@@ -1436,15 +1441,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 }
                 else
                 {
-                    JobHandler = resumeFunc(ActiveJob);
+                    JobHandler = resumeFunc();
                 }
 
                 _navigation.NavigateTo(DeveloperNavigationView.RunningJobView);
                 IsJobRunning = true;
                 ShowJobStatus = true;
 
-                _eventLogger.Log(String.Format("Job '{0}' started...", ActiveJob.Name));
-
                 JobHandler.StatusChanged += (x, status) =>
                 {
                     if (IsJobRunning)
@@ -1464,25 +1467,21 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     if (!segment.IsInterSegment)
                     {
                         _speech.SpeakInfo(String.Format("Segment {0} Started.", segment.SegmentIndex));
-                        _eventLogger.Log(String.Format("Segment {0} Started.", segment.SegmentIndex) + Environment.NewLine + segment.ToJsonString());
                     }
                     else
                     {
                         _speech.SpeakInfo(String.Format("Inter Segment Started."));
-                        _eventLogger.Log("Inter Segment Started.");
                     }
                 };
 
                 JobHandler.UnitCompleted += (x, unit) =>
                 {
                     _speech.SpeakInfo(String.Format("{0} Units Completed.", unit + 1));
-                    _eventLogger.Log(String.Format("{0} Units Completed.", unit + 1));
                 };
 
                 JobHandler.Failed += (x, ex) =>
                 {
                     LogManager.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
-                    _eventLogger.Log(ex, String.Format("Job {0} has failed.", RunningJob.Name));
                     SetJobFailed();
 
                     InvokeUI(() =>
@@ -1496,13 +1495,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 {
                     _speech.SpeakInfo("Finalizing job...");
                     LogManager.Log(String.Format("Finalizing job {0}.", RunningJob.Name));
-                    _eventLogger.Log(String.Format("Finalizing job {0}.", RunningJob.Name));
                 };
 
                 JobHandler.Completed += (x, e) =>
                 {
                     LogManager.Log(String.Format("Job {0} has completed.", RunningJob.Name));
-                    _eventLogger.Log(String.Format("Job {0} has completed.", RunningJob.Name));
                     SetJobCompleted();
                     StopRecordingIfInProgress();
                 };
@@ -1516,7 +1513,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     }
 
                     LogManager.Log(String.Format("Job {0} has been canceled.", RunningJob.Name));
-                    _eventLogger.Log(String.Format("Job {0} has been canceled.", RunningJob.Name));
                     StopRecordingIfInProgress();
                     //Finally Canceled..
                 };
@@ -1534,7 +1530,6 @@ namespace Tango.MachineStudio.Developer.ViewModels
             catch (Exception ex)
             {
                 LogManager.Log(ex);
-                _eventLogger.Log(ex, "An error occurred while starting the job.");
                 _notification.ShowError("An error occurred while starting the job. " + Environment.NewLine + ex.Message);
                 SetJobFailed();
                 StopRecordingIfInProgress();
@@ -1594,8 +1589,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 {
                     LogManager.Log(String.Format("Saving liquid factors for RML {0}...", SelectedRML.Name));
                     await SelectedRML.SaveAsync(_activeJobDbContext);
+                    var rmlAfterChange = RmlDTO.FromObservable(SelectedRML);
+                    _actionLogManager.InsertLog(ActionLogType.RmlSaved, AuthenticationProvider.CurrentUser, SelectedRML.Name, _selectedRMLBeforeLiquidFactorsSaves, rmlAfterChange, "RML liquid factors changed from Machine Studio Research module.");
+                    _selectedRMLBeforeLiquidFactorsSaves = rmlAfterChange;
                     LiquidTypesRmls = ActiveJob.Machine.Configuration.GetSupportedIdsPacks(SelectedRML).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == SelectedRML.Guid).ToList();
 
+
                     foreach (var segment in ActiveJob.Segments)
                     {
                         SetSegmentBrushStopsLiquidVolumes(segment);
@@ -1623,7 +1622,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 LogManager.Log("Invalidating liquid factors, process parameters and process group history...");
 
-                _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML.Guid).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().Build();
+                _selectedRML = new RmlBuilder(_activeJobDbContext).Set(SelectedRML.Guid).WithAllParametersGroup().WithCAT(SelectedMachine.Guid).WithCCT().WithLiquidFactors().WithSpools().Build();
+
+                _selectedRMLBeforeLiquidFactorsSaves = RmlDTO.FromObservable(_selectedRML);
 
                 if (_selectedRML.Cct == null)
                 {
@@ -1672,7 +1673,17 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 {
                     await Task.Factory.StartNew(() =>
                     {
-                        InvalidateLiquidFactorsAndProcessTables();
+                        try
+                        {
+                            IsFree = false;
+                            InvalidateLiquidFactorsAndProcessTables();
+                        }
+                        catch
+                        {}
+                        finally
+                        {
+                            IsFree = true;
+                        }
                     });
                 }
             }
@@ -1680,6 +1691,23 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         #endregion
 
+        #region Color Space
+
+        public void OnBrushStopColorSpaceChanged(BrushStop stop)
+        {
+            if (stop != null && stop.ColorSpace != null && stop.BrushColorSpace != BL.Enumerations.ColorSpaces.Volume)
+            {
+                var lubricant = stop.LiquidVolumes.SingleOrDefault(x => x.LiquidType == LiquidTypes.Lubricant);
+
+                if (lubricant != null)
+                {
+                    lubricant.Volume = 100;
+                }
+            }
+        }
+
+        #endregion
+
         #region Process Parameters Management
 
         /// <summary>
@@ -1691,12 +1719,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 try
                 {
-                    LogManager.Log(String.Format("Uploading process parameters table {0}...", SelectedProcessParametersTable.Name));
+                    LogManager.Log($"Uploading process parameters table {SelectedProcessParametersTable.Name}...");
                     await MachineOperator.UploadProcessParameters(SelectedProcessParametersTable);
                 }
                 catch (Exception ex)
                 {
-                    LogManager.LogFormat(ex, "Failed to upload process parameters table {0}", SelectedProcessParametersTable.Name);
+                    LogManager.Log(ex, $"Failed to upload process parameters table {SelectedProcessParametersTable.Name}");
                     _notification.ShowError("Failed to upload the selected process parameters." + Environment.NewLine + ex.Message);
                 }
             }
@@ -1715,6 +1743,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
             using (_notification.PushTaskItem("Saving Parameters Group..."))
             {
+                var processGroupBefore = ProcessParametersTablesGroupDTO.FromObservable(SelectedRML.GetActiveProcessGroup());
+
                 using (var db = ObservablesContext.CreateDefault())
                 {
                     var active_groups = db.ProcessParametersTablesGroups.Where(x => x.RmlGuid == SelectedRML.Guid && x.Active).ToList();
@@ -1756,6 +1786,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 SelectedRML.ProcessParametersTablesGroups.Add(group);
                 await SelectedRML.SaveAsync(_activeJobDbContext);
 
+                _actionLogManager.InsertLog(ActionLogType.RmlActiveProcessParametersChanged, AuthenticationProvider.CurrentUser, SelectedRML.Name, processGroupBefore, ProcessParametersTablesGroupDTO.FromObservable(SelectedRML.GetActiveProcessGroup()), "RML Active process parameters changed from Machine Studio Research module.");
+
                 InvalidateLiquidFactorsAndProcessTables();
             }
 
@@ -1800,97 +1832,110 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 using (_notification.PushTaskItem("Loading job details..."))
                 {
-                    await Task.Factory.StartNew(() =>
+                    try
                     {
-                        _disable_gamut_check = true;
+                        await Task.Factory.StartNew(() =>
+                        {
+                            _disable_gamut_check = true;
 
-                        LogManager.Log(String.Format("Loading job {0}...", SelectedMachineJob.Name));
-                        SelectedSegments = new ObservableCollection<Segment>();
-                        SelectedBrushStops = new ObservableCollection<BrushStop>();
-                        SelectedRML = null;
-                        SelectedSegment = null;
-                        SelectedGroupHistory = null;
-                        SelectedBrushStop = null;
-                        SelectedProcessParametersTable = null;
-                        RmlProcessParametersTableGroup = null;
+                            LogManager.Log(String.Format("Loading job {0}...", SelectedMachineJob.Name));
+                            SelectedSegments = new ObservableCollection<Segment>();
+                            SelectedBrushStops = new ObservableCollection<BrushStop>();
+                            SelectedRML = null;
+                            SelectedSegment = null;
+                            SelectedGroupHistory = null;
+                            SelectedBrushStop = null;
+                            SelectedProcessParametersTable = null;
+                            RmlProcessParametersTableGroup = null;
 
-                        _blockInvalidateCommands = false;
+                            _blockInvalidateCommands = false;
 
-                        LogManager.Log("Creating active job DB context...");
-                        _activeJobDbContext = ObservablesContext.CreateDefault();
+                            LogManager.Log("Creating active job DB context...");
+                            _activeJobDbContext = ObservablesContext.CreateDefault();
 
-                        LogManager.Log("Initializing available color spaces, RMLs & Winding methods...");
+                            LogManager.Log("Initializing available color spaces, RMLs & Winding methods...");
 
-                        //var processParamsGroups = _activeJobDbContext.ProcessParametersTablesGroups.ToList();
-                        //var processParams = _activeJobDbContext.ProcessParametersTables.ToList();
+                            //var processParamsGroups = _activeJobDbContext.ProcessParametersTablesGroups.ToList();
+                            //var processParams = _activeJobDbContext.ProcessParametersTables.ToList();
 
-                        ColorSpaces = _activeJobDbContext.ColorSpaces.ToObservableCollection();
-                        Rmls = _activeJobDbContext.Rmls.ToObservableCollection();
-                        WindingMethods = _activeJobDbContext.WindingMethods.ToObservableCollection();
-                        SpoolTypes = _activeJobDbContext.SpoolTypes.ToObservableCollection();
+                            ColorSpaces = _activeJobDbContext.ColorSpaces.ToObservableCollection();
+                            Rmls = _activeJobDbContext.Rmls.OrderBy(i => i.Name).ToObservableCollection();
+                            WindingMethods = _activeJobDbContext.WindingMethods.ToObservableCollection();
+                            SpoolTypes = _activeJobDbContext.SpoolTypes.ToObservableCollection();
 
-                        LogManager.Log("Loading machine spools...");
-                        _activeJobDbContext.Spools.Where(x => x.MachineGuid == SelectedMachine.Guid).Load();
+                            LogManager.Log("Loading machine spools...");
+                            _activeJobDbContext.Spools.Where(x => x.MachineGuid == SelectedMachine.Guid).Load();
 
-                        LogManager.Log("Setting active job...");
-                        ActiveJob = new JobBuilder(_activeJobDbContext).Set(SelectedMachineJob.Guid).WithUser().WithSegments().WithBrushStops().WithConfiguration().WithRML().Build();
+                            LogManager.Log("Setting active job...");
+                            ActiveJob = new JobBuilder(_activeJobDbContext).Set(SelectedMachineJob.Guid).WithUser().WithSegments().WithBrushStops().WithConfiguration().WithRML().Build();
 
-                        //_activeJobDbContext.Ccts.Where(x => x.RmlGuid == ActiveJob.RmlGuid).ToList();
-                        //_activeJobDbContext.Cats.Where(x => x.RmlGuid == ActiveJob.RmlGuid).ToList();
-                        //_activeJobDbContext.Machines.SingleOrDefault(x => x.Guid == ActiveJob.MachineGuid);
-                        //_activeJobDbContext.Configurations.SingleOrDefault(x => x.Guid == ActiveJob.Machine.ConfigurationGuid);
+                            //_activeJobDbContext.Ccts.Where(x => x.RmlGuid == ActiveJob.RmlGuid).ToList();
+                            //_activeJobDbContext.Cats.Where(x => x.RmlGuid == ActiveJob.RmlGuid).ToList();
+                            //_activeJobDbContext.Machines.SingleOrDefault(x => x.Guid == ActiveJob.MachineGuid);
+                            //_activeJobDbContext.Configurations.SingleOrDefault(x => x.Guid == ActiveJob.Machine.ConfigurationGuid);
 
-                        //_activeJobDbContext.LiquidTypesRmls.ToList();
+                            //_activeJobDbContext.LiquidTypesRmls.ToList();
 
-                        //_activeJobDbContext.IdsPackFormulas.ToList();
-                        //_activeJobDbContext.LiquidTypes.ToList();
-                        //_activeJobDbContext.MidTankTypes.ToList();
-                        //_activeJobDbContext.DispenserTypes.ToList();
+                            //_activeJobDbContext.IdsPackFormulas.ToList();
+                            //_activeJobDbContext.LiquidTypes.ToList();
+                            //_activeJobDbContext.MidTankTypes.ToList();
+                            //_activeJobDbContext.DispenserTypes.ToList();
 
-                        //_activeJobDbContext.IdsPacks.Where(x => x.ConfigurationGuid == ActiveJob.Machine.ConfigurationGuid).ToList();
+                            //_activeJobDbContext.IdsPacks.Where(x => x.ConfigurationGuid == ActiveJob.Machine.ConfigurationGuid).ToList();
 
+                            _beforeSaveJobDTO = JobDTO.FromObservable(ActiveJob);
 
 
-                        LogManager.Log("Setting selected segment...");
-                        _selectedSegment = ActiveJob.OrderedSegments.FirstOrDefault();
+                            LogManager.Log("Setting selected segment...");
+                            _selectedSegment = ActiveJob.OrderedSegments.FirstOrDefault();
 
-                        ActiveJob.LengthChanged -= ActiveJob_LengthChanged;
-                        ActiveJob.LengthChanged += ActiveJob_LengthChanged;
+                            ActiveJob.LengthChanged -= ActiveJob_LengthChanged;
+                            ActiveJob.LengthChanged += ActiveJob_LengthChanged;
 
-                        _selectedRML = ActiveJob.Rml;
-                        InvalidateLiquidFactorsAndProcessTables();
-                        RaisePropertyChanged(nameof(SelectedRML));
+                            _selectedRML = ActiveJob.Rml;
+                            InvalidateLiquidFactorsAndProcessTables();
+                            RaisePropertyChanged(nameof(SelectedRML));
 
-                        UpdateEstimatedDuration();
+                            UpdateEstimatedDuration();
 
-                        _blockInvalidateCommands = false;
-                        InvalidateRelayCommands();
+                            _blockInvalidateCommands = false;
+                            InvalidateRelayCommands();
 
-                        _disable_gamut_check = false;
+                            _disable_gamut_check = false;
 
-                        _settings.LastSelectedMachineGuid = SelectedMachine != null ? SelectedMachine.Guid : null;
-                        _settings.LastSelectedJobGuid = SelectedMachineJob != null ? SelectedMachineJob.Guid : null;
+                            _settings.LastSelectedMachineGuid = SelectedMachine != null ? SelectedMachine.Guid : null;
+                            _settings.LastSelectedJobGuid = SelectedMachineJob != null ? SelectedMachineJob.Guid : null;
 
-                        _settings.Save();
-                    });
+                            _settings.Save();
+                        });
 
-                    SegmentsCollectionView = CollectionViewSource.GetDefaultView(ActiveJob.Segments);
-                    SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending));
+                        SegmentsCollectionView = CollectionViewSource.GetDefaultView(ActiveJob.Segments);
+                        SegmentsCollectionView.SortDescriptions.Add(new SortDescription(nameof(Segment.SegmentIndex), ListSortDirection.Ascending));
 
-                    foreach (var segment in ActiveJob.Segments)
-                    {
-                        SetSegmentBrushStopsLiquidVolumes(segment);
-                    }
+                        foreach (var segment in ActiveJob.Segments)
+                        {
+                            SetSegmentBrushStopsLiquidVolumes(segment);
+                        }
 
-                    SelectedSegment = _selectedSegment;
+                        SelectedSegment = _selectedSegment;
+
+                        if (ActiveJob != null)
+                        {
+                            _current_job_string = ActiveJob.ToJobFileWhenLoaded().ToString();
+                        }
 
-                    if (ActiveJob != null)
+                        UIHelper.DoEvents();
+                        _navigation.NavigateTo(DeveloperNavigationView.JobView);
+                    }
+                    catch (Exception ex)
                     {
-                        _current_job_string = ActiveJob.ToJobFileWhenLoaded().ToString();
+                        LogManager.Log(ex, "Error loading job.");
+                        _notification.ShowError($"An error occurred while trying to load the selected job.\n{ex.FlattenMessage()}");
+                    }
+                    finally
+                    {
+                        CanWork = true;
                     }
-
-                    UIHelper.DoEvents();
-                    _navigation.NavigateTo(DeveloperNavigationView.JobView);
                 }
 
                 CanWork = true;
@@ -1908,50 +1953,65 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 CanWork = false;
 
-                using (_notification.PushTaskItem("Saving job details..."))
+                try
                 {
-                    await Task.Factory.StartNew(() =>
+                    using (_notification.PushTaskItem("Saving job details..."))
                     {
-                        LogManager.Log(String.Format("Saving the active job {0}...", ActiveJob.Name));
-                        ActiveJob.LastUpdated = DateTime.UtcNow;
-                        ActiveJob.Rml = SelectedRML;
-                        ActiveJob.EstimatedDurationMili = (int)EstimatedDuration.TotalMilliseconds;
-                        _activeJobDbContext.SaveChanges();
-
-                        _machineDbContext.Entry(SelectedMachineJob).Reload();
+                        await Task.Factory.StartNew(() =>
+                        {
+                            LogManager.Log(String.Format("Saving the active job {0}...", ActiveJob.Name));
+                            ActiveJob.LastUpdated = DateTime.UtcNow;
+                            ActiveJob.IsSynchronized = false;
+                            ActiveJob.Rml = SelectedRML;
+                            ActiveJob.EstimatedDurationMili = (int)EstimatedDuration.TotalMilliseconds;
+                            ActiveJob.MarkModified(_activeJobDbContext);
+                            _activeJobDbContext.SaveChanges();
 
+                            var afterJobDTO = JobDTO.FromObservable(ActiveJob);
+                            _actionLogManager.InsertLog(ActionLogType.JobSaved, AuthenticationProvider.CurrentUser, _beforeSaveJobDTO.Name, _beforeSaveJobDTO, afterJobDTO, "Job saved from research module in Machine Studio.");
+                            _beforeSaveJobDTO = afterJobDTO;
 
-                        _machineDbContext.Entry(SelectedMachineJob).Collection(x => x.Segments).Load();
+                            _machineDbContext.Entry(SelectedMachineJob).Reload();
 
-                        foreach (var segment in SelectedMachineJob.Segments.ToList())
-                        {
-                            _machineDbContext.Entry(segment).Collection(x => x.BrushStops).Load();
+                            _machineDbContext.Entry(SelectedMachineJob).Collection(x => x.Segments).Load();
 
-                            foreach (var brushStop in segment.BrushStops.ToList())
+                            foreach (var segment in SelectedMachineJob.Segments.ToList())
                             {
-                                _machineDbContext.Entry(brushStop).Reload();
-                            }
+                                _machineDbContext.Entry(segment).Collection(x => x.BrushStops).Load();
 
-                            _machineDbContext.Entry(segment).Reload();
-                        }
+                                foreach (var brushStop in segment.BrushStops.ToList())
+                                {
+                                    _machineDbContext.Entry(brushStop).Reload();
+                                }
 
-                        InvokeUI(() =>
-                        {
-                            SelectedMachineJob.Segments = SelectedMachineJob.Segments;
-                        });
+                                _machineDbContext.Entry(segment).Reload();
+                            }
 
-                        var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
-                        settings.DefaultJobRmlGuid = ActiveJob.RmlGuid;
-                        settings.Save();
+                            InvokeUI(() =>
+                            {
+                                SelectedMachineJob.Segments = SelectedMachineJob.Segments;
+                            });
 
-                        if (ActiveJob != null)
-                        {
-                            _current_job_string = ActiveJob.ToJobFileWhenLoaded().ToString();
-                        }
-                    });
-                }
+                            var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
+                            settings.DefaultJobRmlGuid = ActiveJob.RmlGuid;
+                            settings.Save();
 
-                CanWork = true;
+                            if (ActiveJob != null)
+                            {
+                                _current_job_string = ActiveJob.ToJobFileWhenLoaded().ToString();
+                            }
+                        });
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error saving active job.");
+                    _notification.ShowError($"An error occurred while trying to save the current job.\n{ex.FlattenMessage()}");
+                }
+                finally
+                {
+                    CanWork = true;
+                }
             }
         }
 
@@ -2139,7 +2199,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             if (ActiveJob != null)
             {
-                LogManager.LogFormat("Adding new segment to job {0}...", ActiveJob.Name);
+                LogManager.Log($"Adding new segment to job {ActiveJob.Name}...");
                 Segment seg = new Segment();
                 seg.Job = ActiveJob;
                 seg.Name = "SEGMENT";
@@ -2171,6 +2231,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 if (_notification.ShowQuestion("Are you sure you want to delete the selected jobs?"))
                 {
+                    var jobsToReport = SelectedJobs.Select(x => JobDTO.FromObservable(x)).ToList();
+
                     LogManager.Log(String.Format("Removing {0} jobs...", SelectedJobs.Count));
                     SelectedJobs.ToList().ForEach(x =>
                     {
@@ -2182,6 +2244,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
                         LogManager.Log("Saving selected machine to database...");
                         await SelectedMachine.SaveAsync(_machineDbContext);
                     }
+
+                    foreach (var job in jobsToReport)
+                    {
+                        _actionLogManager.InsertLog(ActionLogType.JobDeleted, AuthenticationProvider.CurrentUser, job.Name, job, "Job deleted using Machine Studio.", true);
+                    }
                 }
             }
         }
@@ -2202,6 +2269,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
 
                     Job newJob = new Job();
+                    newJob.LastUpdated = DateTime.UtcNow;
+                    newJob.JobSource = JobSource.Remote;
                     newJob.Name = jobName;
                     newJob.CreationDate = DateTime.UtcNow;
                     newJob.UserGuid = AuthenticationProvider.CurrentUser.Guid;
@@ -2236,6 +2305,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                     LogManager.Log("Saving selected machine to database...");
                     await SelectedMachine.SaveAsync(_machineDbContext);
+                    _actionLogManager.InsertLog(ActionLogType.JobCreated, AuthenticationProvider.CurrentUser, newJob.Name, newJob, "Job created using Machine Studio.");
                     SelectedMachineJob = newJob;
                     LoadSelectedJob();
                 }
@@ -2261,6 +2331,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             return;
                         }
                         SelectedSegment.BrushStops.Remove(x);
+                        var existingBrushStop = _activeJobDbContext.BrushStops.FirstOrDefault(y => y.Guid == x.Guid);
+                        if(existingBrushStop != null)
+                        {
+                            _activeJobDbContext.BrushStops.Remove(existingBrushStop);
+                        }
+
+
                     });
 
                     ArrangeBrushStopsIndices();
@@ -2275,7 +2352,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             if (SelectedSegment != null)
             {
-                LogManager.LogFormat("Adding new brush stop to segment...", SelectedSegment.SegmentIndex.ToString());
+                LogManager.Log($"Adding new brush stop to segment '{SelectedSegment.SegmentIndex}'...");
 
                 var stop = new BrushStop();
 
@@ -2295,6 +2372,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 stop.SetAllDispensingStepDivisions(BL.Dispensing.DispenserStepDivisions.D8);
                 stop.SetLiquidVolumes(SelectedMachine.Configuration, SelectedRML, SelectedProcessParametersTable);
                 SelectedSegment.BrushStops.Add(stop);
+               // _activeJobDbContext.BrushStops.Add(stop);
                 SelectedSegment.BrushStops.ToList().ForEach(x => x.RaiseOffsetChanged());
                 ArrangeBrushStopsIndices();
             }
@@ -2305,7 +2383,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// </summary>
         private void DuplicateSelectedBrushStops()
         {
-            LogManager.LogFormat("Duplicating {0} brush stops...", SelectedBrushStops.Count);
+            LogManager.Log($"Duplicating {SelectedBrushStops.Count} brush stops...");
 
             foreach (var stop in SelectedBrushStops.OrderBy(x => x.StopIndex))
             {
@@ -2323,7 +2401,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// </summary>
         private void DuplicateSelectedSegments()
         {
-            LogManager.LogFormat("Duplicating {0} segments...", SelectedSegments.Count);
+            LogManager.Log($"Duplicating {SelectedSegments.Count} segments...");
 
             int start_index = SelectedSegments.Max(x => x.SegmentIndex);
 
@@ -2351,7 +2429,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                 {
                     CanWork = false;
 
-                    LogManager.LogFormat("Duplicating {0} jobs...", SelectedJobs.Count);
+                    LogManager.Log($"Duplicating {SelectedJobs.Count} jobs...");
 
                     int index = SelectedMachine.Jobs.Max(x => x.JobIndex);
 
@@ -2365,6 +2443,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     LogManager.Log("Saving selected machine to database...");
                     await SelectedMachine.SaveAsync(_machineDbContext);
 
+                    foreach (var job in SelectedJobs)
+                    {
+                        _actionLogManager.InsertLog(ActionLogType.JobCreated, AuthenticationProvider.CurrentUser, job.Name, job, "Job cloned using Machine Studio.");
+                    }
+
                     CanWork = true;
                 }
             }
@@ -2588,17 +2671,26 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                         LogManager.Log($"Importing job files...");
 
+                        List<Job> jobsToReport = new List<Job>();
+
                         foreach (var file in dlg.FileNames)
                         {
                             var bytes = File.ReadAllBytes(file);
                             var jobFile = JobFile.Parser.ParseFrom(bytes);
                             var job = await Job.FromJobFile(jobFile, SelectedMachine.Guid, AuthenticationProvider.CurrentUser.Guid);
+                            job.JobSource = JobSource.Remote;
 
                             _machineDbContext.Jobs.Add(job);
+                            jobsToReport.Add(job);
                         }
 
                         await _machineDbContext.SaveChangesAsync();
 
+                        foreach (var job in jobsToReport)
+                        {
+                            _actionLogManager.InsertLog(ActionLogType.JobImported, AuthenticationProvider.CurrentUser, job.Name, job, "Job imported using Machine Studio.");
+                        }
+
                         IsFree = true;
 
                         _notification.ShowInfo($"Jobs imported successfully.");
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 f0e9dc29c..c0cb963e7 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,8 +5,10 @@
              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="450" Width="800" Background="{StaticResource WhiteBackgroundBrush}" d:DataContext="{d:DesignInstance Type=vm:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}">
+             Height="590" Width="800" d:DataContext="{d:DesignInstance Type=vm:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}" Foreground="{StaticResource Dialog.Foreground}" 
+             Background="{StaticResource Dialog.Background}">
     <Grid Margin="10">
         <DockPanel>
             <StackPanel DockPanel.Dock="Top">
@@ -23,28 +25,60 @@
                 <Button HorizontalAlignment="Right" DockPanel.Dock="Bottom" Height="40" Width="140" Command="{Binding CloseCommand}" Margin="10 0 0 0">CLOSE</Button>
             </Grid>
 
-            <Border Margin="0 40 0 0" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}" CornerRadius="3">
-                <ItemsControl ItemsSource="{Binding Exception.IdsPackLevels}">
+            <Border Margin="0 20 0 0" Padding="10" BorderThickness="1" BorderBrush="{StaticResource BorderBrushGainsboro}" CornerRadius="3">
+                <ItemsControl ItemsSource="{Binding Exception.IdsPackLevels}" VerticalAlignment="Top">
                     <ItemsControl.ItemsPanel>
                         <ItemsPanelTemplate>
-                            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal" IsItemsHost="True"></StackPanel>
+                            <StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Vertical" IsItemsHost="True"></StackPanel>
                         </ItemsPanelTemplate>
                     </ItemsControl.ItemsPanel>
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <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 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}">
                                     <Grid>
-                                        <Border CornerRadius="3" VerticalAlignment="Bottom" Loaded="IdsPackLoaded" MinHeight="5">
+                                        <Border VerticalAlignment="Center" CornerRadius="3" Loaded="IdsPackLoaded" MinHeight="45" HorizontalAlignment="Left" MinWidth="5">
                                             <Border.Background>
-                                                <LinearGradientBrush>
-                                                    <GradientStop Offset="0" Color="#4DFFFFFF" />
+                                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
                                                     <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" VerticalAlignment="Bottom">
+                                        <Rectangle Loaded="Limit_Loaded" Stroke="Red" StrokeThickness="2" HorizontalAlignment="Left">
                                             <Rectangle.Style>
                                                 <Style TargetType="Rectangle">
                                                     <Style.Triggers>
@@ -69,9 +103,18 @@
                                                 </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>
-                            </StackPanel>
+                                <TextBlock Grid.Column="2" HorizontalAlignment="Left" Text="{Binding Message}" VerticalAlignment="Center" Margin="20,0,0,0" TextWrapping="Wrap" Foreground="{StaticResource RedBrush100}"></TextBlock>
+                            </Grid>                                                                                                                                                                                                                        
                         </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 171cb754e..51cfb1e73 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.Height = ((double)packLevel.Current / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight;
+            border.Width = ((double)packLevel.Current / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualWidth;
         }
 
         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 top = ((double)packLevel.Required / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualHeight;
-            rect.Margin = new Thickness(0, 0, 0, top);
+            var left = ((double)packLevel.Required / (double)MachineOperator.MAX_DISPENSER_NANOLITER) * parent.ActualWidth;
+            rect.Margin = new Thickness(left, 0, 0, 0);
 
             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 3bda86036..32b7ccd86 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,7 +28,8 @@
              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>
 
@@ -241,91 +242,93 @@
         </Style>
 
         <DataTemplate x:Key="Volume_Template">
-            <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 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>
-                </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>
+                    <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>
             </StackPanel>
         </DataTemplate>
 
@@ -677,7 +680,7 @@
                                         </StackPanel>
                                     </Border>
 
-                                    <Border Style="{StaticResource JobFieldBorder}">
+                                    <Border Style="{StaticResource JobFieldBorder}" Visibility="{Binding IsSideBarOpened,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                         <StackPanel Margin="20 5 5 5"  Width="140">
                                             <StackPanel Orientation="Horizontal">
                                                 <Image Source="../Images/repeat.png" Width="32"></Image>
@@ -753,7 +756,7 @@
                                                                 <StackPanel>
                                                                     <TextBlock>MEDIA</TextBlock>
                                                                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}" Style="{StaticResource TransparentComboBoxStyle}" HorizontalContentAlignment="Stretch">
+                                                                        <controls:SearchComboBox Width="250"  ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}"  HorizontalContentAlignment="Stretch" SearchProperty="Name">
                                                                             <ComboBox.ItemTemplate>
                                                                                 <DataTemplate>
                                                                                     <DockPanel>
@@ -768,7 +771,7 @@
                                                                                     </DockPanel>
                                                                                 </DataTemplate>
                                                                             </ComboBox.ItemTemplate>
-                                                                        </ComboBox>
+                                                                        </controls:SearchComboBox>
 
                                                                         <!--<Button  Margin="20 30 0 0" Command="{Binding EditRMLCommand}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}">
                                                                             <StackPanel Orientation="Horizontal">
@@ -789,9 +792,9 @@
 
                                                         </StackPanel>
 
-                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0 40 180 0">
+                                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="60 40 180 0" Visibility="{Binding IsSideBarOpened,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                                             <materialDesign:PackIcon Kind="ChevronLeft" Width="24" Height="24" />
-                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>SUPPORTED MEDIA LIQUID</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
+                                                            <TextBlock  Margin="0 -2 0 0" VerticalAlignment="Center"><Run>MEDIA LIQUIDS</Run> <Run FontSize="10"  Foreground="{StaticResource DimGrayBrush}">( Max Nanolitter/CM )</Run></TextBlock>
                                                             <materialDesign:PackIcon Kind="ChevronRight" Width="24" Height="24" />
                                                         </StackPanel>
 
@@ -895,7 +898,7 @@
                                                             </DockPanel>
                                                         </Grid>
                                                         <Grid Margin="0 10 10 0">
-                                                            <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">
+                                                            <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">
                                                                 <ListBox.Template>
                                                                     <ControlTemplate TargetType="{x:Type ListBox}">
                                                                         <Border x:Name="Bd" SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}"
@@ -973,7 +976,8 @@
                                                                                                         <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.ColorSpaces}" SelectedItem="{Binding ColorSpace}" DisplayMemberPath="Name" Width="100" HorizontalAlignment="Left">
+                                                                                                    <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.ItemContainerStyle>
                                                                                                             <Style TargetType="ComboBoxItem" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
                                                                                                                 <Setter Property="Background" Value="{StaticResource WhiteBrush100}"></Setter>
@@ -1187,6 +1191,41 @@
                                                                                                                                                 <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">
+                                                                                                                                        <Label.Style>
+                                                                                                                                            <Style TargetType="Label">
+                                                                                                                                                <Setter Property="Content">
+                                                                                                                                                    <Setter.Value>
+                                                                                                                                                        <TextBlock>
                                                                                                                                                  <Run Text="{Binding PulsePerSecond,Mode=OneWay,StringFormat='0.0'}"></Run>
                                                                                                                                                  <Run Text="(pulse)" FontSize="9" Foreground="{StaticResource GrayBrush250}"></Run>
                                                                                                                                                         </TextBlock>
@@ -1366,7 +1405,7 @@
                 <Grid Background="{StaticResource TransparentBackgroundBrush100}">
                     <Grid.Style>
                         <Style TargetType="Grid">
-                            <Setter Property="Width" Value="520"></Setter>
+                            <Setter Property="Width" Value="640"></Setter>
                             <Setter Property="LayoutTransform">
                                 <Setter.Value>
                                     <ScaleTransform ScaleY="1" ScaleX="0"></ScaleTransform>
@@ -1481,7 +1520,7 @@
                                                                                     <Setter Property="Template">
                                                                                         <Setter.Value>
                                                                                             <ControlTemplate TargetType="ContentControl">
-                                                                                                <Grid Width="97">
+                                                                                                <Grid Width="97" ToolTip="{Binding Name}" Background="Transparent" ToolTipService.InitialShowDelay="1000" ToolTipService.BetweenShowDelay="1000">
                                                                                                     <Border>
                                                                                                         <Border.Style>
                                                                                                             <Style TargetType="Border">
@@ -1504,7 +1543,7 @@
 
 
                                                                             </WrapPanel.Resources>
-                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}" GeneratingItems="ParameterizedEditor_GeneratingItems">
+                                                                            <editors:ParameterizedEditor ParameterizedObject="{Binding}">
                                                                                 <editors:ParameterizedEditor.ItemsPanel>
                                                                                     <ItemsPanelTemplate>
                                                                                         <WrapPanel IsItemsHost="True" Orientation="Horizontal" />
@@ -1512,11 +1551,11 @@
                                                                                 </editors:ParameterizedEditor.ItemsPanel>
                                                                                 <editors:ParameterizedEditor.DoubleTemplate>
                                                                                     <DataTemplate>
-                                                                                        <Grid Background="Transparent" Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnProcessParameterDropped" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=editors:ParameterizedEditor},Path=DraggingSurface}">
+                                                                                        <Grid Background="Transparent">
                                                                                             <ContentControl>
                                                                                                 <StackPanel>
-                                                                                                    <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>
+                                                                                                    <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>
                                                                                                 </StackPanel>
                                                                                             </ContentControl>
                                                                                         </Grid>
@@ -1572,16 +1611,17 @@
 
                                                 <StackPanel Orientation="Horizontal">
                                                     <ToggleButton IsChecked="{Binding AutoProcessSelection}" />
-                                                    <TextBlock Margin="5 0 0 0">Use Recommended Process Parameters (auto)</TextBlock>
+                                                    <TextBlock Margin="5 3 0 0">Use Recommended Process Parameters (auto)</TextBlock>
                                                 </StackPanel>
 
-                                                <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">
+                                                <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">
                                                         <TextBlock TextWrapping="Wrap" TextAlignment="Center">
                                                         TEMP OFF
                                                         </TextBlock>
                                                     </Button>
-                                                    <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                                                        <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>
@@ -1594,6 +1634,7 @@
                                                         </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 28e488aae..94c1ed802 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,46 +159,6 @@ 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;
@@ -321,5 +281,10 @@ 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 f8a10e7c4..a3d2dbd68 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="../Images/machine-trans.png" RenderOptions.BitmapScalingMode="Fant" Width="50"></Image>
+                                    <Image Source="{StaticResource MachineSmall}" 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 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}">
+                                <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}">
                                     <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">
+                                        <DataGridTemplateColumn Header="CREATED BY" Width="100" CanUserSort="True" SortMemberPath="User.Contact.FirstName">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
-                                                    <TextBlock Text="{Binding User.Contact.FirstName}" VerticalAlignment="Center" FontSize="14"></TextBlock>
+                                                    <TextBlock Text="{Binding User.Contact.FirstName,TargetNullValue='PPC',FallbackValue='PPC'}" 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 abea6aec9..d0caa2447 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,31 +330,36 @@
                                                                     <Rectangle Height="30" Margin="0 10 0 0" VerticalAlignment="Center" Fill="{Binding SegmentBrush}">
                                                                     </Rectangle>
 
-                                                                    <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 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>
+
                                                                 </StackPanel>
 
                                                                 <Rectangle HorizontalAlignment="Right" Stroke="White" Margin="0 35 0 25" ></Rectangle>
@@ -408,8 +413,7 @@
                                 </Grid>
                             </DockPanel>
 
-                            <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>
+                              </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 e7f16146b..0400ee7e6 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">
+        <Grid HorizontalAlignment="Right" Margin="0 0 0 82">
             <ContentControl Content="{Binding}">
                 <ContentControl.Style>
                     <Style TargetType="ContentControl">