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

27 files changed, 263 insertions, 67 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
index fd0a63456..ba6c13e91 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
@@ -89,7 +89,7 @@
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
 
-                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="10" RadiusY="10" />
+                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="8" RadiusY="8" />
                 </Grid>
             </Border>
         </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml
index a0bc6c1d9..97aedcf89 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml
@@ -90,7 +90,7 @@
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
 
-                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="10" RadiusY="10" />
+                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="8" RadiusY="8" />
                 </Grid>
             </Border>
         </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view - blue.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view - blue.png
new file mode 100644
index 000000000..a37e0b555
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view - blue.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view.png
new file mode 100644
index 000000000..697ce228c
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-blue.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-blue.png
new file mode 100644
index 000000000..cab937cef
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-blue.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-gray.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-gray.png
new file mode 100644
index 000000000..0ca2eed8c
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-gray.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/plus.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/plus.png
new file mode 100644
index 000000000..de965130e
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/plus.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view - blue.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view - blue.png
new file mode 100644
index 000000000..d0a97503e
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view - blue.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view.png
new file mode 100644
index 000000000..873b7513f
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
index 8ed2ff80e..aedf09ce7 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
@@ -469,10 +469,23 @@
   <ItemGroup>
     <Resource Include="Images\Coats\thread.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\plus.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\pencil-blue.png" />
+    <Resource Include="Images\pencil-gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\large-cards-view - blue.png" />
+    <Resource Include="Images\large-cards-view.png" />
+    <Resource Include="Images\small-cards-view - blue.png" />
+    <Resource Include="Images\small-cards-view.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index c78af155c..2532aeef6 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -1062,7 +1062,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     {
                         FineTuneItems.Clear();
 
-                        foreach (var stop in Job.Segments.SelectMany(x => x.BrushStops).DistinctBy(x => x.Color))
+                        foreach (var stop in Job.Segments.SelectMany(x => x.BrushStops).Where(x => x.ColorSpace.Space == BL.Enumerations.ColorSpaces.RGB || x.ColorSpace.Space == BL.Enumerations.ColorSpaces.LAB).DistinctBy(x => x.Color))
                         {
                             FineTuneItem item = new FineTuneItem(_converter.Convert(stop));
                             item.BrushStops = Job.Segments.SelectMany(x => x.BrushStops).Where(x => x.Color == stop.Color).ToList();
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
index cf49bd024..3b92581bc 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
@@ -89,7 +89,7 @@
                             <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Completed</TextBlock>
                         </StackPanel>
 
-                        <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                        <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                                             <Run Text="{Binding RunningJobStatus.ProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"></Run><Run Text="/" /><Run Text="{Binding RunningJobStatus.TotalProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"/>
                                             <Run FontSize="16">m</Run>
                         </TextBlock>
@@ -109,7 +109,7 @@
                         <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Time Left</TextBlock>
                     </StackPanel>
 
-                    <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                    <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                         <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=5}"></Run>
                         <Run FontSize="16" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
                     </TextBlock>
@@ -201,7 +201,7 @@
                     </Canvas>
 
                     <Grid>
-                        <controls:RunningJobViewer Height="30" Width="600" DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" />
+                        <controls:RunningJobViewer Height="26" Width="600" DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" />
 
                         <TextBlock Margin="0 0 -50 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right">
                             <Run Text="x"></Run><Run Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
index ac2d5b3be..95508197d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
@@ -12,7 +12,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:JobSummeryViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.JobSummeryViewVM}">
 
-    <Grid Background="{StaticResource TangoMidBackgroundBrush}">
+    <Grid Background="White">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="1*"/>
@@ -22,7 +22,7 @@
             <Border.Effect>
                 <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" />
             </Border.Effect>
-            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold" Text="Ready to Dye"></TextBlock>
+            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold" Text="Dye Job"></TextBlock>
         </Border>
 
         <Grid Grid.Row="1">
@@ -31,16 +31,15 @@
                     <Grid DockPanel.Dock="Bottom">
                         <StackPanel>
                             <Grid>
-                                <touch:TouchButton HorizontalAlignment="Left" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Command="{Binding EditCommand}" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" RippleBrush="{StaticResource TangoRippleDarkBrush}" Background="Transparent" EnableDropShadow="False" Height="80" Padding="0" Width="270" Foreground="{StaticResource TangoPrimaryAccentBrush}" CornerRadius="40" BlurRadius="20">
-                                    <StackPanel Orientation="Horizontal">
-                                        <fa:ImageAwesome Icon="Pencil" Width="24" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
-                                        <TextBlock Margin="20 0 0 0" VerticalAlignment="Center">EDIT</TextBlock>
-                                    </StackPanel>
+                                <touch:TouchButton HorizontalContentAlignment="Stretch" HorizontalAlignment="Left" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Command="{Binding EditCommand}" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" RippleBrush="{StaticResource TangoRippleDarkBrush}" Background="Transparent" EnableDropShadow="False" Height="80" Padding="0" Width="270" Foreground="{StaticResource TangoPrimaryAccentBrush}" CornerRadius="40" BlurRadius="20">
+                                    <DockPanel>
+                                        <Image DockPanel.Dock="Left" Source="../Images/pencil-blue.png" Width="30" Height="23" VerticalAlignment="Center" Margin="40 0 0 5"></Image>
+                                        <TextBlock Margin="0 0 55 0" HorizontalAlignment="Center" VerticalAlignment="Center">EDIT</TextBlock>
+                                    </DockPanel>
                                 </touch:TouchButton>
                                 <touch:TouchButton IsEnabled="{Binding MachineProvider.MachineOperator.CanPrint}" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Margin="20 0 0 0" Height="80" Padding="0" Width="270" CornerRadius="40" BlurRadius="20" HorizontalAlignment="Right" DelayCommand="{Binding DyeCommand}" DelayCommandDuration="00:00:0.3">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock VerticalAlignment="Center">DYE</TextBlock>
-                                        <touch:TouchIcon Margin="20 0 0 0" Icon="ChevronRight" Width="14" />
                                     </StackPanel>
                                 </touch:TouchButton>
                             </Grid>
@@ -69,7 +68,7 @@
                                             <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Length</TextBlock>
                                         </StackPanel>
 
-                                        <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                        <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                                             <Run Text="{Binding Job.LengthIncludingNumberOfUnits,Mode=OneWay,StringFormat=0,FallbackValue=0}"/>
                                             <Run FontSize="16">m</Run>
                                         </TextBlock>
@@ -83,7 +82,7 @@
                                             <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Time</TextBlock>
                                         </StackPanel>
 
-                                        <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                        <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                                         <Run Text="{Binding EstimatedDuration,Mode=OneWay,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=5}"></Run>
                                         <Run FontSize="16" Text="{Binding EstimatedDuration,Mode=OneWay,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
                                         </TextBlock>
@@ -92,7 +91,7 @@
                             </UniformGrid>
                         </Grid>
 
-                        <controls:JobSummeryViewer Height="50" DataContext="{Binding Job}" VerticalAlignment="Center" Margin="20 0" Grid.Row="2" />
+                        <controls:JobSummeryViewer Height="40" DataContext="{Binding Job}" VerticalAlignment="Center" Margin="20 0" Grid.Row="2" />
                     </Grid>
                 </DockPanel>
             </Border>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index ec21ebade..9287203aa 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -107,7 +107,7 @@
         </DataTemplate>
 
         <DataTemplate x:Key="BrushStop_Template" DataType="{x:Type entities:BrushStop}">
-            <Grid Margin="50 20 140 20" RenderOptions.EdgeMode="Aliased">
+            <Grid Margin="50 20 140 20">
                 <StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <Border Width="48" Height="48" CornerRadius="5" BorderThickness="1" BorderBrush="{StaticResource TangoGrayBrush}">
@@ -548,12 +548,21 @@
                                                 <Border x:Name="borderDockFloat" Height="80">
                                                     <DockPanel x:Name="dockEdit" LastChildFill="False" Style="{StaticResource Level2ContainerExtraMargin}" Height="40" Width="640">
                                                         <StackPanel DockPanel.Dock="Left" Orientation="Horizontal">
-                                                            <touch:TouchToggleIconButton x:Name="toggle_small_list" IsChecked="{Binding ElementName=toggle_large_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right" Icon="ListSolid" CheckedIcon="ListSolid" Padding="8" CornerRadius="20" />
-                                                            <Rectangle HorizontalAlignment="Left" Stroke="{StaticResource TangoDividerBrush}" Margin="10 8" />
-                                                            <touch:TouchToggleIconButton x:Name="toggle_large_list" IsChecked="{Binding ElementName=toggle_small_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right" Icon="ThListSolid" CheckedIcon="ThListSolid" Padding="8" CornerRadius="20" />
+                                                            <touch:TouchToggleImageButton x:Name="toggle_small_list" UncheckedImage="../Images/small-cards-view.png"  CheckedImage="../Images/small-cards-view - blue.png" 
+                                                                                     IsChecked="{Binding ElementName=toggle_large_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right" 
+                                                                                      Padding="8" CornerRadius="30" Width="44" />
+                                                           <Rectangle HorizontalAlignment="Left" Stroke="{StaticResource TangoDividerBrush}" Margin="10 8" />
+                                                            <touch:TouchToggleImageButton x:Name="toggle_large_list" UncheckedImage="../Images/large-cards-view.png"  CheckedImage="../Images/large-cards-view - blue.png" 
+                                                                                     IsChecked="{Binding ElementName=toggle_small_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right"
+                                                                                      Padding="8" CornerRadius="30" Width="44" />
                                                         </StackPanel>
-
-                                                        <touch:TouchToggleIconButton x:Name="toggleEdit" DockPanel.Dock="Right" Icon="Pencil" CheckedIcon="Pencil" Padding="8" CornerRadius="20" />
+                                                        <touch:TouchToggleImageButton x:Name="toggleEdit" UncheckedImage="../Images/pencil-gray.png" 
+                                                                                      CheckedImage="../Images/pencil-blue.png" 
+                                                                                      DockPanel.Dock="Right" 
+                                                                                      IsChecked="{Binding IsSelected}" 
+                                                                                      Padding="8" CornerRadius="30" Width="40" Height="40">
+                                                            </touch:TouchToggleImageButton>
+                                                        <!--<touch:TouchToggleIconButton x:Name="toggleEdit" DockPanel.Dock="Right" Icon="Pencil" CheckedIcon="Pencil" Padding="8" CornerRadius="20" />-->
                                                     </DockPanel>
                                                 </Border>
 
@@ -562,8 +571,8 @@
                                                 <StackPanel HorizontalAlignment="Right" Style="{StaticResource Level2Container}" Orientation="Horizontal">
                                                     <touch:TouchButton Command="{Binding AddSolidSegmentCommand}" FontWeight="Normal" RippleBrush="{StaticResource TangoRippleDarkBrush}" FontSize="{StaticResource TangoDefaultFontSize}" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="170" CornerRadius="20" Padding="0 10" Background="Transparent" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}">
                                                         <StackPanel Orientation="Horizontal">
-                                                            <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="16" Height="16" />
-                                                            <TextBlock Margin="10 0 0 0">SOLID SEGMENT</TextBlock>
+                                                            <Image VerticalAlignment="Center" Margin="0 1 0 0" Source="../Images/plus.png" Width="12"/>
+                                                            <TextBlock Margin="10 2 0 0">SOLID SEGMENT</TextBlock>
                                                         </StackPanel>
                                                     </touch:TouchButton>
                                                     <touch:TouchButton Command="{Binding AddGradientSegmentCommand}" FontWeight="Normal" RippleBrush="{StaticResource TangoRippleDarkBrush}" FontSize="{StaticResource TangoDefaultFontSize}" Margin="30 0 0 0" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" Padding="0 10" Width="200" CornerRadius="20" Background="Transparent" BorderThickness="2">
@@ -575,8 +584,8 @@
                                                         </touch:TouchButton.BorderBrush>
 
                                                         <StackPanel Orientation="Horizontal">
-                                                            <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="16" Height="16" />
-                                                            <TextBlock Margin="10 0 0 0">GRADIENT SEGMENT</TextBlock>
+                                                            <Image VerticalAlignment="Center" Margin="0 1 0 0" Source="../Images/plus.png" Width="12"/>
+                                                            <TextBlock Margin="10 2 0 0">GRADIENT SEGMENT</TextBlock>
                                                         </StackPanel>
                                                     </touch:TouchButton>
                                                 </StackPanel>
@@ -648,7 +657,7 @@
 
                                                 <StackPanel Style="{StaticResource Level2ContainerExtraMargin}">
                                                     <Grid>
-                                                        <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" />
+                                                        <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" Height="40"/>
                                                     </Grid>
 
                                                     <DockPanel Margin="0 30 0 0" LastChildFill="False">
@@ -694,28 +703,6 @@
                                         <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Additional Tools</TextBlock>
                                     </StackPanel>
 
-                                    <!--<Border Style="{StaticResource TangoTouchBorder}" Margin="0 12 0 0" Padding="0 0 0 40">
-                                <StackPanel>
-                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  Style="{StaticResource Level1Container}">
-                                        <Image Source="../Images/JobView/additional-tools.png" Width="39" />
-                                        <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Additional Tools</TextBlock>
-                                    </StackPanel>
-
-                                    <StackPanel Style="{StaticResource Level2Container}" HorizontalAlignment="Left">
-
-                                        <DockPanel LastChildFill="False">
-                                            <TextBlock Text="Make a sample dye" VerticalAlignment="Center"></TextBlock>
-                                            <touch:TouchToggleSlider x:Name="toggle_sample_dye" DockPanel.Dock="Right" Width="75" Style="{StaticResource TouchToggleButtonCheck}" Margin="30 0 0 0" Height="38" HorizontalAlignment="Left" />
-                                        </DockPanel>
-
-                                        <DockPanel Margin="0 25 0 0" LastChildFill="False">
-                                            <TextBlock Text="Run color fine tuning" VerticalAlignment="Center"></TextBlock>
-                                            <touch:TouchToggleSlider DockPanel.Dock="Right" Width="75" Style="{StaticResource TouchToggleButtonCheck}" Margin="30 0 0 0" Height="38" HorizontalAlignment="Left" />
-                                        </DockPanel>
-                                    </StackPanel>
-                                </StackPanel>
-                            </Border>-->
-
                                     <touch:TouchVirtualizedContentControl>
                                         <touch:TouchExpander x:Name="expander_sample_dye" Margin="0 0 0 0" Padding="20 15">
                                             <touch:TouchExpander.Header>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
index 5b9c234f0..c615583bc 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
@@ -292,9 +292,9 @@
                                 <touch:LightTouchDataGridColumn.Header>
                                     <Image Source="../Images/warning.png" Width="24" />
                                 </touch:LightTouchDataGridColumn.Header>
-                                <touch:LightTouchDataGridColumn.CellTemplate>
+                                <touch:LightTouchDataGridColumn.CellTemplate >
                                     <DataTemplate>
-                                        <touch:TouchIcon Width="26">
+                                        <touch:TouchIcon Width="26" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" >
                                             <touch:TouchIcon.Style>
                                                 <Style TargetType="touch:TouchIcon">
                                                     <Setter Property="Icon" Value="Check"></Setter>
@@ -311,17 +311,17 @@
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
-                            <touch:LightTouchDataGridColumn Width="100" Header="Status" SortMember="JobStatus">
+                            <touch:LightTouchDataGridColumn Width="100" Header="Status" SortMember="JobStatus" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter},IsAsync=True}"></controls:FastTextBlock>
+                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter},IsAsync=True}" HorizontalAlignment="Left" VerticalAlignment="Center"></controls:FastTextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
                             <touch:LightTouchDataGridColumn Width="1*" Header="Name" SortMember="Name" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding Name,IsAsync=True}"></controls:FastTextBlock>
+                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding Name,IsAsync=True}" HorizontalAlignment="Left" VerticalAlignment="Center"></controls:FastTextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
index b5b9f9b23..04021d6b6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
@@ -49,6 +49,7 @@
     <converters:NullObjectToBooleanConverter x:Key="NullObjectToBooleanConverter" />
     <converters:IsNullToVisibilityConverter x:Key="IsNullToVisibilityConverter" />
     <converters:StringToLinesConverter x:Key="StringToLinesConverter" />
+    <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter" />
 
     <Style TargetType="FrameworkElement">
         <Setter Property="TextElement.FontFamily" Value="{StaticResource TangoFlexoFontFamily}"></Setter>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationView.xaml
new file mode 100644
index 000000000..e0c7ccbb6
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationView.xaml
@@ -0,0 +1,67 @@
+<UserControl x:Class="Tango.PPC.UI.Dialogs.CartridgeValidationView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:local="clr-namespace:Tango.PPC.UI.Dialogs"
+             xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             Background="{StaticResource TangoPrimaryBackgroundBrush}"  d:DesignHeight="555" d:DesignWidth="560" Width="570" Height="700" d:DataContext="{d:DesignInstance Type=local:CartridgeValidationViewVM, IsDesignTimeCreatable=False}">
+
+    <Grid Margin="20">
+        <DockPanel>
+            <Grid DockPanel.Dock="Bottom">
+                <touch:TouchButton HorizontalAlignment="Left" CornerRadius="25" Command="{Binding CloseCommand}" Style="{StaticResource TangoHollowButton}" Width="150" Height="50" VerticalAlignment="Bottom">CANCEL</touch:TouchButton>
+                <touch:TouchButton HorizontalAlignment="Right" CornerRadius="25" Command="{Binding OKCommand}" Style="{StaticResource TangoHollowButton}" Width="150" Height="50" VerticalAlignment="Bottom">CONFIRM</touch:TouchButton>
+            </Grid>
+            <StackPanel DockPanel.Dock="Top">
+                <Image Source="/Images/cartridge_validation.png" RenderOptions.BitmapScalingMode="Fant" Stretch="Uniform" Height="120"></Image>
+                <TextBlock HorizontalAlignment="Center" Margin="0 20 0 0" FontSize="{StaticResource TangoHeaderFontSize}">Validate Cartridge Type</TextBlock>
+                <TextBlock Margin="20 10" HorizontalAlignment="Center" TextWrapping="Wrap" TextAlignment="Center">
+                   Ink cartridge has been inserted to the system. Please validate the cartridge ink by selecting the correct color.
+                </TextBlock>
+            </StackPanel>
+            <Grid>
+                <touch:TouchStaticListBox HorizontalAlignment="Center" VerticalAlignment="Center" ItemsSource="{Binding IDSPacks}" SelectedItem="{Binding SelectedIDSPack}">
+                    <touch:TouchStaticListBox.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <WrapPanel />
+                        </ItemsPanelTemplate>
+                    </touch:TouchStaticListBox.ItemsPanel>
+                    <touch:TouchStaticListBox.ItemContainerStyle>
+                        <Style TargetType="touch:TouchStaticListBoxItem">
+                            <Setter Property="RenderTransformOrigin" Value="0.5,0.5"></Setter>
+                            <Setter Property="RenderTransform">
+                                <Setter.Value>
+                                    <ScaleTransform ScaleX="1" ScaleY="1"></ScaleTransform>
+                                </Setter.Value>
+                            </Setter>
+                            <Style.Triggers>
+                                <Trigger Property="IsSelected" Value="True">
+                                    <Setter Property="RenderTransform">
+                                        <Setter.Value>
+                                            <ScaleTransform ScaleX="1.2" ScaleY="1.2"></ScaleTransform>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Trigger>
+                            </Style.Triggers>
+                        </Style>
+                    </touch:TouchStaticListBox.ItemContainerStyle>
+                    <touch:TouchStaticListBox.ItemTemplate>
+                        <DataTemplate DataType="{x:Type entities:IdsPack}">
+                            <StackPanel Margin="15" Width="70">
+                                <Ellipse Width="70" Height="70">
+                                    <Ellipse.Fill>
+                                        <SolidColorBrush Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                    </Ellipse.Fill>
+                                </Ellipse>
+                                <TextBlock Text="{Binding LiquidType.Name}" TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0 10 0 0"></TextBlock>
+                            </StackPanel>
+                        </DataTemplate>
+                    </touch:TouchStaticListBox.ItemTemplate>
+                </touch:TouchStaticListBox>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationView.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationView.xaml.cs
new file mode 100644
index 000000000..dbfb990b6
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.PPC.UI.Dialogs
+{
+    /// <summary>
+    /// Interaction logic for TechnicianModeLoginView.xaml
+    /// </summary>
+    public partial class CartridgeValidationView : UserControl
+    {
+        public CartridgeValidationView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationViewVM.cs
new file mode 100644
index 000000000..f901723a4
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/CartridgeValidationViewVM.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using Tango.SharedUI;
+
+namespace Tango.PPC.UI.Dialogs
+{
+    public class CartridgeValidationViewVM : DialogViewVM
+    {
+        private List<IdsPack> _idsPacks;
+        public List<IdsPack> IDSPacks
+        {
+            get { return _idsPacks; }
+            set { _idsPacks = value; RaisePropertyChangedAuto(); }
+        }
+
+        private IdsPack _selectedIDSPack;
+        public IdsPack SelectedIDSPack
+        {
+            get { return _selectedIDSPack; }
+            set { _selectedIDSPack = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        public CartridgeValidationViewVM()
+        {
+            IDSPacks = new List<IdsPack>();
+        }
+
+        protected override bool CanOK()
+        {
+            return base.CanOK() && SelectedIDSPack != null;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/cartridge_validation.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/cartridge_validation.png
new file mode 100644
index 000000000..373cb78c1
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/cartridge_validation.png
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
index 5062df1d6..65337a892 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
@@ -143,9 +143,9 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Error",
                 Brush = Application.Current.Resources["TangoMessageBoxErrorBrush"] as Brush,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderErrorBrush"] as Brush,
             });
         }
-
         /// <summary>
         /// Shows an information message box.
         /// </summary>
@@ -159,6 +159,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Information",
                 Brush = Application.Current.Resources["TangoMessageBoxInfoBrush"] as Brush,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderInfoBrush"] as Brush,
             });
         }
 
@@ -175,6 +176,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.AlertCircleOutline,
                 Title = "Warning",
                 Brush = Application.Current.Resources["TangoMessageBoxWarningBrush"] as Brush,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderWarningBrush"] as Brush,
             });
         }
 
@@ -192,6 +194,7 @@ namespace Tango.PPC.UI.Notifications
                 Title = "Confirm",
                 HasCancel = true,
                 Brush = Application.Current.Resources["TangoMessageBoxQuestionBrush"] as Brush,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderQuestionBrush"] as Brush,
             });
         }
 
@@ -208,6 +211,7 @@ namespace Tango.PPC.UI.Notifications
                 Icon = TouchIconKind.Check,
                 Title = "Success",
                 Brush = Application.Current.Resources["TangoMessageBoxSuccessBrush"] as Brush,
+                HeaderBrush = Application.Current.Resources["TangoMessageBoxHeaderSuccessBrush"] as Brush,
             });
         }
 
@@ -388,7 +392,7 @@ namespace Tango.PPC.UI.Notifications
                 throw new NullReferenceException("The view " + viewType.ToString() + " is not of type framework element.");
             }
 
-            return ShowDialog<T>(datacontext, Activator.CreateInstance(viewType) as FrameworkElement);
+            return ShowDialog<T>(datacontext, view);
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 8d7de3537..f0fc43864 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.0.40.0")]
+[assembly: AssemblyVersion("1.0.42.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml
index 2b89aac82..f0e872285 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml
@@ -7,5 +7,10 @@
     <SolidColorBrush x:Key="TangoMessageBoxErrorBrush" Color="#FF6262" />
     <SolidColorBrush x:Key="TangoMessageBoxSuccessBrush" Color="#56da6c" />
     <SolidColorBrush x:Key="TangoMessageBoxQuestionBrush" Color="{StaticResource TangoPrimaryAccentColor}" />
+    <SolidColorBrush x:Key="TangoMessageBoxHeaderInfoBrush" Color="#DCE7FC" />
+    <SolidColorBrush x:Key="TangoMessageBoxHeaderWarningBrush" Color="#FFF4E9" />
+    <SolidColorBrush x:Key="TangoMessageBoxHeaderErrorBrush" Color="#F9E9EE" />
+    <SolidColorBrush x:Key="TangoMessageBoxHeaderSuccessBrush" Color="#F1FFF4" />
+    <SolidColorBrush x:Key="TangoMessageBoxHeaderQuestionBrush" Color="#DCE7FC" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index 389f5d59b..c2025b733 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -122,9 +122,13 @@
     <Compile Include="Connectivity\WiFiAuthenticationViewVM.cs" />
     <Compile Include="Converters\AppBarItemConverter.cs" />
     <Compile Include="Converters\ItemBaseConverter.cs" />
+    <Compile Include="Dialogs\CartridgeValidationView.xaml.cs">
+      <DependentUpon>CartridgeValidationView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Dialogs\ScreenLockView.xaml.cs">
       <DependentUpon>ScreenLockView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Dialogs\CartridgeValidationViewVM.cs" />
     <Compile Include="Dialogs\TechnicianModeLoginView.xaml.cs">
       <DependentUpon>TechnicianModeLoginView.xaml</DependentUpon>
     </Compile>
@@ -194,6 +198,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Dialogs\CartridgeValidationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Dialogs\ScreenLockView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -311,6 +319,7 @@
     <Resource Include="Images\GlobalStatus\service_Anim.gif" />
     <Resource Include="Images\GlobalStatus\shutdown_icon_Anim.gif" />
     <Resource Include="Images\GlobalStatus\standby_Anim.gif" />
+    <Resource Include="Images\cartridge_validation.png" />
     <Content Include="Manifests\release.xml" />
     <Content Include="Manifests\debug.xml" />
     <None Include="packages.config" />
@@ -546,7 +555,7 @@ del "$(TargetDir)firmware_package.tfp"</PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
index a4f550a39..01a47539e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using System.Windows.Threading;
 using Tango.Core.DI;
 using Tango.Integration.ExternalBridge;
+using Tango.Integration.Operation;
 using Tango.PPC.Common;
 using Tango.PPC.Common.Application;
 using Tango.PPC.Common.Authentication;
@@ -14,6 +15,7 @@ using Tango.PPC.Common.Modules;
 using Tango.PPC.Common.Navigation;
 using Tango.PPC.Common.Notifications;
 using Tango.PPC.Common.WatchDog;
+using Tango.PPC.UI.Dialogs;
 using Tango.SharedUI;
 
 namespace Tango.PPC.UI.ViewModels
@@ -49,6 +51,13 @@ namespace Tango.PPC.UI.ViewModels
         /// </summary>
         public override void OnApplicationStarted()
         {
+
+        }
+
+        public override void OnApplicationReady()
+        {
+            base.OnApplicationReady();
+            MachineProvider.MachineOperator.CartridgeValidationRequestReceived += MachineOperator_CartridgeValidationRequestReceived;
         }
 
         #region Event Handlers
@@ -63,6 +72,26 @@ namespace Tango.PPC.UI.ViewModels
             CurrentDateTime = DateTime.Now;
         }
 
+        private void MachineOperator_CartridgeValidationRequestReceived(object sender, CartridgeValidationEventArgs e)
+        {
+            InvokeUI(async () =>
+            {
+                var vm = await NotificationProvider.ShowDialog<CartridgeValidationViewVM>(new CartridgeValidationViewVM()
+                {
+                    IDSPacks = MachineProvider.Machine.Configuration.NoneEmptyIdsPacks.ToList(),
+                });
+
+                if (vm.DialogResult)
+                {
+                    e.Approve(vm.SelectedIDSPack.PackIndex);
+                }
+                else
+                {
+                    e.Decline();
+                }
+            });
+        }
+
         #endregion
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 13d0e56d5..902b9c769 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -25,7 +25,7 @@
     <Grid>
         <touch:TouchSideMenu x:Name="menu" IsOpened="{Binding IsMenuOpened,Mode=TwoWay}" Grid.Row="1" >
             <touch:TouchSideMenu.MenuContent>
-                <Border TextElement.FontSize="{StaticResource TangoMenuItemFontSize}" TextElement.FontFamily="{StaticResource TangoFlexoFontFamily}" Width="450" x:Name="border" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDarkForegroundBrush}" TextElement.Foreground="{StaticResource TangoDarkForegroundBrush}">
+                <Border TextElement.FontSize="{StaticResource TangoMenuItemFontSize}" Width="450" x:Name="border" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDarkForegroundBrush}" TextElement.Foreground="{StaticResource TangoDarkForegroundBrush}">
                     <DockPanel LastChildFill="False" Background="{StaticResource TangoPrimaryBackgroundBrush}">
                         <StackPanel MinWidth="300" DockPanel.Dock="Top">
                             <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1" Height="320">
@@ -36,13 +36,30 @@
                                     HorizontalAlignment="Right"
                                     IsChecked="{Binding ElementName=menu,Path=IsOpened}" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
 
-                                    <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" FontSize="{StaticResource TangoSmallFontSize}" Margin="40 20 20 50" VerticalAlignment="Bottom" HorizontalAlignment="Left">
+                                    <StackPanel Orientation="Horizontal" Margin="40 20 20 50" VerticalAlignment="Bottom" HorizontalAlignment="Left">
+                                        <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" FontSize="{StaticResource TangoSmallFontSize}">
                                         <Run>Machine S/N:</Run>
                                         <Run FontStyle="Italic" Text="{Binding MachineProvider.Machine.SerialNumber,Mode=OneWay,IsAsync=True,FallbackValue='0000'}"></Run>
                                         <Run>|</Run>
                                         <Run>Version:</Run>
                                         <Run FontStyle="Italic" Text="{Binding ApplicationManager.Version,FallbackValue='1.0.0.0',Mode=OneWay,IsAsync=True}"></Run>
-                                    </TextBlock>
+                                        </TextBlock>
+
+                                        <TextBlock Margin="5 0 0 0" Foreground="{StaticResource TangoGrayTextBrush}" FontSize="{StaticResource TangoSmallFontSize}">
+                                            <TextBlock.Style>
+                                                <Style TargetType="TextBlock">
+                                                    <Setter Property="Visibility" Value="Visible"></Setter>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding Settings.DeploymentSlot}" Value="PROD">
+                                                            <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </TextBlock.Style>
+                                            <Run>|</Run>
+                                            <Run Text="{Binding Settings.DeploymentSlot}"></Run>
+                                        </TextBlock>
+                                    </StackPanel>
                                 </Grid>
                             </Border>
                             <!--<StackPanel Margin="0 5 0 0">
@@ -59,7 +76,7 @@
                                     <DataTemplate>
                                         <Border Visibility="{Binding DockToBottom,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                             <Border BorderBrush="{StaticResource TangoDividerBrush}" BorderThickness="0 0 0 1" Visibility="{Binding IsVisibleInMenu,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                <touch:TouchButton Margin="0 0 0 0" Padding="40 25" Foreground="{StaticResource TangoDarkForegroundBrush}" Style="{StaticResource TangoFlatButton}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}">
+                                                <touch:TouchButton Margin="0 0 0 0" Padding="40 25" Foreground="{StaticResource TangoDarkForegroundBrush}" Style="{StaticResource TangoFlatButton}" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ModuleNavigationCommand}" CommandParameter="{Binding Name}" >
                                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                                         <Image VerticalAlignment="Center" Source="{Binding Image}" Width="32" Height="32"></Image>
                                                         <TextBlock VerticalAlignment="Center" Margin="40 0 0 0" Text="{Binding Name}" Foreground="{StaticResource TangoPrimaryAccentBrush}"></TextBlock>
@@ -108,7 +125,7 @@
                                 </ItemsControl.ItemTemplate>
                             </ItemsControl>-->
 
-                           
+
                             <Border Background="{StaticResource TangoPowerMenuOpenedBackgroundBrush}" Height="350" Padding="20" RenderTransformOrigin="0.5,1" VerticalAlignment="Bottom">
                                 <Border.Style>
                                     <Style TargetType="Border">
@@ -287,7 +304,7 @@
                         <!--MODULES GOES HERE-->
                     </controls:NavigationControl>
                 </Grid>
-                
+
             </DockPanel>
         </touch:TouchSideMenu>
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>