From cd8bec354b018a03ed3960ed4f76970d4cbff2ef Mon Sep 17 00:00:00 2001
From: Victoria Plitt <Victoria.Plitt@twine-s.com>
Date: Tue, 16 May 2023 16:12:09 +0300
Subject: Bugs + added  Display Job Outline button in Tech. mode

Related Work Items: #8407
---
 .../PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml   |    4 +-
 .../PPC/Tango.PPC.UI/Views/MachineStatusView.xaml  | 1659 ++++++++++----------
 2 files changed, 842 insertions(+), 821 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Views')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml
index acaf14f15..a72dc2d1d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml
@@ -59,7 +59,7 @@
                                                    Foreground="{StaticResource TangoLightForegroundBrush}" Background="{StaticResource TangoMidAccentBrush}" CornerRadius="18" Margin="0 8 0 8">
                                    
                                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                            <touch:TouchIcon Icon="ArrowLeft" Background="Transparent" Width="30" BorderThickness="0" >
+                                            <touch:TouchIcon Icon="ArrowLeft" Background="Transparent" Width="30" BorderThickness="0">
                                                 <touch:TouchIcon.Style>
                                                 <Style TargetType="touch:TouchIcon" BasedOn="{StaticResource {x:Type touch:TouchIcon}}">
                                                     <Style.Triggers>
@@ -70,7 +70,7 @@
                                                     </Style>
                                             </touch:TouchIcon.Style>
                                                 </touch:TouchIcon>
-                                            <TextBox BorderThickness="0" Background="Transparent" Height="32" FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalAlignment="Center" Foreground="{StaticResource TangoLightForegroundBrush}"  Margin="0 0 0 0" VerticalContentAlignment="Center" >Back</TextBox>
+                                            <TextBlock  Background="Transparent"  FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalAlignment="Center" Foreground="{StaticResource TangoLightForegroundBrush}"  Margin="0 0 0 0"   >Back</TextBlock>
                                         </StackPanel>
                                    
                                 </touch:TouchButton>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
index 44be63ffe..d9b37ac85 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -214,7 +214,7 @@
                                     </CombinedGeometry.Geometry1>
                                     <CombinedGeometry.Geometry2>
                                         
-                                        <RectangleGeometry Rect="1,30 30,88">
+                                        <RectangleGeometry Rect="1,0,30,88">
                                             <!--<RectangleGeometry.Rect>
                                                 <MultiBinding Converter="{StaticResource MidTankLevelToElementRectConverter}">
                                                     <Binding Source="{StaticResource RectHeight}"/>
@@ -241,364 +241,371 @@
 
     </UserControl.Resources>
     <Grid Width="960" Height="1080">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="28"></ColumnDefinition>
-            <ColumnDefinition Width="1*"></ColumnDefinition>
-        </Grid.ColumnDefinitions>
-        <Border>
-            <Border.Background>
-                <LinearGradientBrush StartPoint="0,0" EndPoint="1,0" >
-                    <GradientStop Color="Gainsboro" Offset="0" />
-                    <GradientStop Color="{StaticResource TangoMidBackgroundColor}" Offset="1.0" />
-                </LinearGradientBrush>
-            </Border.Background>
-        </Border>
-        <Grid Grid.Column="1" Background="{StaticResource TangoMidBackgroundBrush}" Margin="0 0 0 0" >
-        <Grid Margin="0 18 0 0">
-            <Grid.RowDefinitions>
-            <RowDefinition Height="56"></RowDefinition>
-            <RowDefinition Height="1*"></RowDefinition>
-        </Grid.RowDefinitions>
+        <Grid >
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="28"></ColumnDefinition>
+                <ColumnDefinition Width="1*"></ColumnDefinition>
+            </Grid.ColumnDefinitions>
+            <Border>
+                <Border.Background>
+                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0" >
+                        <GradientStop Color="Gainsboro" Offset="0" />
+                        <GradientStop Color="{StaticResource TangoMidBackgroundColor}" Offset="1.0" />
+                    </LinearGradientBrush>
+                </Border.Background>
+            </Border>
+            <Grid Grid.Column="1" Background="{StaticResource TangoMidBackgroundBrush}" Margin="0 0 0 0" >
+                <Grid Margin="0 18 0 0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="56"></RowDefinition>
+                        <RowDefinition Height="1*"></RowDefinition>
+                    </Grid.RowDefinitions>
 
-                <touch:TouchToggleSlider Style="{StaticResource TouchToggleButtonSlider}" Background="Transparent" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 0 0 0"  CornerRadius="25" Height="50" Width="335" ThumbWidth="168" LeftText="Job Status" RightText="Overview" ThumbCornerRadius="18" IsChecked="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanInverseConverter}}"></touch:TouchToggleSlider>
+                    <touch:TouchToggleSlider Style="{StaticResource TouchToggleButtonSlider}" Background="Transparent" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 0 0 0"  CornerRadius="25" Height="50" Width="335" ThumbWidth="168" LeftText="Job Status" RightText="Overview" ThumbCornerRadius="18" IsChecked="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanInverseConverter}}"></touch:TouchToggleSlider>
 
-                <Canvas Width="300" VerticalAlignment="Top" HorizontalAlignment="Right" Height="56" Margin="0 -30 -60 0">
-                    <Grid Panel.ZIndex="100" DockPanel.Dock="Top" Height="117" Background="Transparent">
-                        <Grid HorizontalAlignment="Right" Margin="0 0 0 0">
-                        <StackPanel Orientation="Horizontal">
-                            <Grid>
-                                <StackPanel x:Name="techPressElement" VerticalAlignment="Center" Background="Transparent" Orientation="Horizontal"> 
-                                    <TextBlock Margin="0 10 20 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" Text="{Binding MachineProvider.MachineOperator.Status,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
-                                    <locaControls:MachineStatusControl HorizontalAlignment="Center" DataContext="{Binding MachineProvider.MachineOperator}" />
-                                
-                                </StackPanel>
+                    <Canvas Width="300" VerticalAlignment="Top" HorizontalAlignment="Right" Height="56" Margin="0 -30 -60 0">
+                        <Grid Panel.ZIndex="100" DockPanel.Dock="Top" Height="117" Background="Transparent">
+                            <Grid HorizontalAlignment="Right" Margin="0 0 0 0">
+                                <StackPanel Orientation="Horizontal">
+                                    <Grid>
+                                        <StackPanel x:Name="techPressElement" VerticalAlignment="Center" Background="Transparent" Orientation="Horizontal">
+                                            <TextBlock Margin="0 10 20 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" Text="{Binding MachineProvider.MachineOperator.Status,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock>
+                                            <locaControls:MachineStatusControl HorizontalAlignment="Center" DataContext="{Binding MachineProvider.MachineOperator}" />
 
-                                <Grid IsHitTestVisible="False" HorizontalAlignment="Center">
-                                    <Grid.Style>
-                                        <Style TargetType="Grid">
-                                            <Setter Property="Visibility" Value="Hidden"></Setter>
-                                            <Style.Triggers>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.MachineStatus.AutoInkFillingEnabled}" Value="True">
-                                                    <Setter Property="Visibility" Value="Visible"></Setter>
-                                                </DataTrigger>
-                                                <DataTrigger Binding="{Binding MachineProvider.MachineOperator.IsConnected}" Value="False">
+                                        </StackPanel>
+
+                                        <Grid IsHitTestVisible="False" HorizontalAlignment="Center">
+                                            <Grid.Style>
+                                                <Style TargetType="Grid">
                                                     <Setter Property="Visibility" Value="Hidden"></Setter>
-                                                </DataTrigger>
-                                            </Style.Triggers>
-                                        </Style>
-                                    </Grid.Style>
-                                </Grid>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding MachineProvider.MachineOperator.MachineStatus.AutoInkFillingEnabled}" Value="True">
+                                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding MachineProvider.MachineOperator.IsConnected}" Value="False">
+                                                            <Setter Property="Visibility" Value="Hidden"></Setter>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </Grid.Style>
+                                        </Grid>
+                                    </Grid>
+                                </StackPanel>
                             </Grid>
-                        </StackPanel>
-                    </Grid>
-                </Grid>
-                </Canvas>
-            <Grid x:Name="JobStatus" Margin="32 18 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityConverter}}">
-                <Grid.RowDefinitions>
-                <RowDefinition Height="78"></RowDefinition>
-                <RowDefinition Height="Auto"></RowDefinition>
-                <RowDefinition Height="Auto"></RowDefinition>
-                <RowDefinition Height="Auto"></RowDefinition>
-                <RowDefinition Height="100"></RowDefinition>
+                        </Grid>
+                    </Canvas>
+                    <Grid x:Name="JobStatus" Margin="32 18 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="78"></RowDefinition>
+                            <RowDefinition Height="Auto"></RowDefinition>
+                            <RowDefinition Height="Auto"></RowDefinition>
+                            <RowDefinition Height="Auto"></RowDefinition>
+                            <RowDefinition Height="100"></RowDefinition>
 
-                </Grid.RowDefinitions>
-                <Grid Margin=" 0 0 0 20">
-                    <DockPanel>
-                        <touch:TouchButton Command="{Binding GoToJobCommand}" DockPanel.Dock="Right" VerticalAlignment="Top" Style="{StaticResource TangoLinkButton}"  Foreground="{StaticResource TangoPrimaryAccentBrush}">
-                            <StackPanel Orientation="Vertical">
-                                <TextBlock Margin="5 0 0 0" FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Bottom">Go To Job</TextBlock>
-                                <Rectangle Height="3" Fill="{StaticResource TangoPrimaryAccentBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0"></Rectangle>
-                            </StackPanel>
-                        </touch:TouchButton>
-                        <TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TangoLargeHeaderFontSize}" Text="{Binding Job.Name, TargetNullValue='-', FallbackValue='-'}"> </TextBlock>
-                    </DockPanel>
-                    <Border Height="2" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
-                </Grid>
+                        </Grid.RowDefinitions>
+                        <Grid Margin=" 0 0 0 20">
+                            <DockPanel>
+                                <touch:TouchButton Command="{Binding GoToJobCommand}" DockPanel.Dock="Right" VerticalAlignment="Top" Style="{StaticResource TangoLinkButton}"  Foreground="{StaticResource TangoPrimaryAccentBrush}">
+                                    <StackPanel Orientation="Vertical">
+                                        <TextBlock Margin="5 0 0 0" FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Bottom">Go To Job</TextBlock>
+                                        <Rectangle Height="3" Fill="{StaticResource TangoPrimaryAccentBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0"></Rectangle>
+                                    </StackPanel>
+                                </touch:TouchButton>
+                                <touch:TouchButton  DockPanel.Dock="Right" Visibility="{Binding ApplicationManager.IsInTechnicianMode,Converter={StaticResource BooleanToVisibilityConverter}}" VerticalAlignment="Top" Margin="0 0 20 0" Command="{Binding DisplayJobOutlineCommand}" Style="{StaticResource TangoLinkButton}"  FontSize="{StaticResource TangoTitleFontSize}">
+                                    <StackPanel Orientation="Vertical">
+                                        <TextBlock Margin="5 0 0 0" FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Bottom">Display Job Outline</TextBlock>
+                                        <Rectangle Height="3" Fill="{StaticResource TangoPrimaryAccentBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0"></Rectangle>
+                                    </StackPanel>
+                                </touch:TouchButton>
+                                <TextBlock DockPanel.Dock="Left" FontSize="{StaticResource TangoLargeHeaderFontSize}" Text="{Binding Job.Name, TargetNullValue='-', FallbackValue='-'}"></TextBlock>
+                            </DockPanel>
+                            <Border Height="2" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
+                        </Grid>
 
-                <DockPanel Grid.Row="1" Margin="0 11 0 0">
-                        <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Top"  Width="200" MinHeight="30" HorizontalAlignment="Right" Margin="0 0 0 0">
-                            <StackPanel Orientation="Vertical">
-                                <touch:TouchToggleSlider Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 0 20 0"  CornerRadius="17" Height="38" Width="164" ThumbWidth="80" LeftText="1 Set" RightText="1 Spool" ThumbCornerRadius="13" IsChecked="{Binding IsSpoolView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
-                                <touch:TouchToggleSlider  Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 18 20 0"  CornerRadius="17" Height="38" Width="164" ThumbWidth="80" LeftText="Length" RightText="Weight" ThumbCornerRadius="13" IsChecked="{Binding IsWeghtView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
+                        <DockPanel Grid.Row="1" Margin="0 11 0 0">
+                            <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Top"  Width="200" MinHeight="30" HorizontalAlignment="Right" Margin="0 0 0 0">
+                                <StackPanel Orientation="Vertical">
+                                    <touch:TouchToggleSlider Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 0 20 0"  CornerRadius="17" Height="38" Width="164" ThumbWidth="80" LeftText="1 Set" RightText="1 Spool" ThumbCornerRadius="13" IsChecked="{Binding IsSpoolView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
+                                    <touch:TouchToggleSlider  Style="{StaticResource TouchToggleButtonSlider}" Background="{StaticResource TangoMidBackgroundBrush}" CheckedBackground="{StaticResource TangoMidBackgroundBrush}" UncheckedBackground="{StaticResource TangoMidBackgroundBrush}"  HorizontalAlignment="Right" VerticalAlignment="Top" Margin="20 18 20 0"  CornerRadius="17" Height="38" Width="164" ThumbWidth="80" LeftText="Length" RightText="Weight" ThumbCornerRadius="13" IsChecked="{Binding IsWeghtView}" FontSize="{StaticResource TangoDefaultFontSize}"></touch:TouchToggleSlider>
+                                </StackPanel>
                             </StackPanel>
-                        </StackPanel>
 
-                        <UniformGrid DockPanel.Dock="Left" Columns="1" Rows="5" HorizontalAlignment="Left" Margin="0 0 0 0" Height="326" VerticalAlignment="Top">
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                            <Image Source="../Images/Job Issues/thread_type.png" Stretch="None" VerticalAlignment="Top"/>
-                            <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Thread Type</TextBlock>
-                                    <TextBlock Text="{Binding Job.Rml.Name, TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock>
-                            </StackPanel>
-                        </StackPanel>
+                            <UniformGrid DockPanel.Dock="Left" Columns="1" Rows="5" HorizontalAlignment="Left" Margin="0 0 0 0" Height="326" VerticalAlignment="Top">
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <Image Source="../Images/Job Issues/thread_type.png" Stretch="None" VerticalAlignment="Top"/>
+                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Thread Type</TextBlock>
+                                        <TextBlock Text="{Binding Job.Rml.Name, TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock>
+                                    </StackPanel>
+                                </StackPanel>
 
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                            <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-                            <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length</TextBlock>
-                                    <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
-                                        <TextBlock.Style>
-                                            <Style TargetType="{x:Type TextBlock}">
-                                                <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
-                                                        <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </TextBlock.Style>
-                                    </TextBlock>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length</TextBlock>
+                                        <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
+                                            <TextBlock.Style>
+                                                <Style TargetType="{x:Type TextBlock}">
+                                                    <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
+                                                            <Setter Property="Text" Value="{Binding Job.LengthIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </TextBlock.Style>
+                                        </TextBlock>
+                                    </StackPanel>
                                 </StackPanel>
-                            </StackPanel>
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                            <Image Source="../Images/Job Issues/job_weight.png" Stretch="None" VerticalAlignment="Top"/>
-                            <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight</TextBlock>
-                                    <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
-                                        <TextBlock.Style>
-                                            <Style TargetType="{x:Type TextBlock}">
-                                                <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
-                                                        <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </TextBlock.Style>
-                                    </TextBlock>
-                            </StackPanel>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                            <Image Source="../Images/Job Issues/job_copies.png" Stretch="None" VerticalAlignment="Top"/>
-                            <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Copies</TextBlock>
-                                    <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
-                                        <TextBlock.Style>
-                                            <Style TargetType="{x:Type TextBlock}">
-                                                <Setter Property="Text" Value="{Binding Job.NumberOfUnitsMultipliedBySpools, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
-                                                        <Setter Property="Text" Value="{Binding Job.NumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </TextBlock.Style>
-                                    </TextBlock>
-                            </StackPanel>
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                            <Image Source="../Images/Job Issues/spools.png" Stretch="None" VerticalAlignment="Top"/>
-                            <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Spools</TextBlock>
-                                    <TextBlock Text="{Binding Job.Spools, TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock>
-                            </StackPanel>
-                        </StackPanel>
-                    </UniformGrid>
-                        <Grid x:Name="StatusCicle" Background="{StaticResource TangoMidBackgroundBrush}" VerticalAlignment="Top">
-                        <StackPanel VerticalAlignment="Center">
-                                <Grid>
-                                    <touch:TouchRingProgress Width="364" Height="364" RingThickness="10">
-                                <touch:TouchRingProgress.Style>
-                                    <Style TargetType="touch:TouchRingProgress">
-                                        <Setter Property="Visibility" Value="Visible"></Setter>
-                                        <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
-                                        <Setter Property="Maximum" Value="{Binding RunningJobStatus.TotalProgressMinusSettingUp}"></Setter>
-                                        <Setter Property="Value" Value="{Binding RunningJobStatus.ProgressMinusSettingUp}"></Setter>
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="False">
-                                               <Setter Property="Visibility" Value="Visible"></Setter>
-                                            </DataTrigger>
-                                            <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
-                                                <Setter Property="Maximum" Value="100"></Setter>
-                                                <Setter Property="Value" Value="99.9999999"></Setter>
-                                                <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
-                                            </DataTrigger>
-                                            <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
-                                                <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
-                                            </DataTrigger>
-                                            <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
-                                                <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </touch:TouchRingProgress.Style>
-                            </touch:TouchRingProgress>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <Image Source="../Images/Job Issues/job_weight.png" Stretch="None" VerticalAlignment="Top"/>
+                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight</TextBlock>
+                                        <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
+                                            <TextBlock.Style>
+                                                <Style TargetType="{x:Type TextBlock}">
+                                                    <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnitsAndSpools, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
+                                                            <Setter Property="Text" Value="{Binding Job.WeightIncludingNumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </TextBlock.Style>
+                                        </TextBlock>
+                                    </StackPanel>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <Image Source="../Images/Job Issues/job_copies.png" Stretch="None" VerticalAlignment="Top"/>
+                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Copies</TextBlock>
+                                        <TextBlock  FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
+                                            <TextBlock.Style>
+                                                <Style TargetType="{x:Type TextBlock}">
+                                                    <Setter Property="Text" Value="{Binding Job.NumberOfUnitsMultipliedBySpools, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding IsSpoolView}" Value="True">
+                                                            <Setter Property="Text" Value="{Binding Job.NumberOfUnits, TargetNullValue='-', FallbackValue='-', StringFormat=0.##}" />
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </TextBlock.Style>
+                                        </TextBlock>
+                                    </StackPanel>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <Image Source="../Images/Job Issues/spools.png" Stretch="None" VerticalAlignment="Top"/>
+                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Spools</TextBlock>
+                                        <TextBlock Text="{Binding Job.Spools, TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock>
+                                    </StackPanel>
+                                </StackPanel>
+                            </UniformGrid>
+                            <Grid x:Name="StatusCicle" Background="{StaticResource TangoMidBackgroundBrush}" VerticalAlignment="Top">
+                                <StackPanel VerticalAlignment="Center">
+                                    <Grid>
+                                        <touch:TouchRingProgress Width="364" Height="364" RingThickness="10">
+                                            <touch:TouchRingProgress.Style>
+                                                <Style TargetType="touch:TouchRingProgress">
+                                                    <Setter Property="Visibility" Value="Visible"></Setter>
+                                                    <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                                                    <Setter Property="Maximum" Value="{Binding RunningJobStatus.TotalProgressMinusSettingUp}"></Setter>
+                                                    <Setter Property="Value" Value="{Binding RunningJobStatus.ProgressMinusSettingUp}"></Setter>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="False">
+                                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
+                                                            <Setter Property="Maximum" Value="100"></Setter>
+                                                            <Setter Property="Value" Value="99.9999999"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </touch:TouchRingProgress.Style>
+                                        </touch:TouchRingProgress>
 
-                                    <touch:TouchBusyIndicator Width="360" Height="360" StrokeThickness="10" Maximum="100" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <touch:TouchBusyIndicator.Style>
-                                            <Style TargetType="touch:TouchBusyIndicator">
-                                                <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
-                                                <Setter Property="Value" Value="0"></Setter>
-                                                <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
-                                                        <Setter Property="Visibility" Value="Visible"></Setter>
-                                                        <Setter Property="Value" Value="0"></Setter>
-                                                        <Setter Property="IsIndeterminate" Value="True"></Setter>
-                                                        <Setter Property="Foreground">
-                                                            <Setter.Value>
-                                                                <LinearGradientBrush StartPoint="0, 0" EndPoint="1, 1">
-                                                                    <GradientStop Offset="0.2" Color="{StaticResource TangoValidationErrorColor}"/>
-                                                                    <GradientStop Offset="0.5" Color="Yellow"/>
-                                                                    <GradientStop Offset="0.8" Color="{StaticResource TangoPrimaryAccentColor}"/>
-                                                                </LinearGradientBrush>
-                                                            </Setter.Value>
-                                                        </Setter>
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
-                                                        <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
-                                                        <Setter Property="Value" Value="99.9999999"></Setter>
-                                                        <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                                        <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
-                                                        <Setter Property="Value" Value="99.9999999"></Setter>
-                                                        <Setter Property="IsIndeterminate" Value="False"></Setter>
-                                                        <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
-                                                    </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </touch:TouchBusyIndicator.Style>
-                                    </touch:TouchBusyIndicator>
+                                        <touch:TouchBusyIndicator Width="360" Height="360" StrokeThickness="10" Maximum="100" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <touch:TouchBusyIndicator.Style>
+                                                <Style TargetType="touch:TouchBusyIndicator">
+                                                    <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                                                    <Setter Property="Value" Value="0"></Setter>
+                                                    <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
+                                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                                            <Setter Property="Value" Value="0"></Setter>
+                                                            <Setter Property="IsIndeterminate" Value="True"></Setter>
+                                                            <Setter Property="Foreground">
+                                                                <Setter.Value>
+                                                                    <LinearGradientBrush StartPoint="0, 0" EndPoint="1, 1">
+                                                                        <GradientStop Offset="0.2" Color="{StaticResource TangoValidationErrorColor}"/>
+                                                                        <GradientStop Offset="0.5" Color="Yellow"/>
+                                                                        <GradientStop Offset="0.8" Color="{StaticResource TangoPrimaryAccentColor}"/>
+                                                                    </LinearGradientBrush>
+                                                                </Setter.Value>
+                                                            </Setter>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
+                                                            <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
+                                                            <Setter Property="Value" Value="99.9999999"></Setter>
+                                                            <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
+                                                            <Setter Property="Value" Value="99.9999999"></Setter>
+                                                            <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </touch:TouchBusyIndicator.Style>
+                                        </touch:TouchBusyIndicator>
 
-                                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                                        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
 
-                                        <StackPanel Visibility="{Binding RunningJobStatus.IsSettingUp, TargetNullValue=true, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                                <Image Source="../Images/JobProgressView/drop.png" Stretch="None" VerticalAlignment="Center" />
+                                            <StackPanel Visibility="{Binding RunningJobStatus.IsSettingUp, TargetNullValue=true, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Completed /</TextBlock>
-                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}"> Length</TextBlock>
-                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}"> Weight</TextBlock>
+                                                    <Image Source="../Images/JobProgressView/drop.png" Stretch="None" VerticalAlignment="Center" />
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Completed /</TextBlock>
+                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}"> Length</TextBlock>
+                                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}"> Weight</TextBlock>
+                                                    </StackPanel>
                                                 </StackPanel>
-                                            </StackPanel>
 
-                                            <StackPanel Orientation="Horizontal" Margin="0 15 0 0" HorizontalAlignment="Center"  Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                                <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
-                                                    <TextBlock.Text>
-                                                        <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0.#" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
-                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
-                                                            <Binding Path="IsSpoolView"/>
-                                                            <Binding Path="RunningJobStatus.ProgressMinusSettingUp" />
-                                                        </MultiBinding>
-                                                    </TextBlock.Text>
-                                                </TextBlock>
-                                                <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
-                                                <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
-                                                    <TextBlock.Text>
-                                                        <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
-                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
-                                                            <Binding Path="IsSpoolView"/>
-                                                        </MultiBinding>
-                                                    </TextBlock.Text>
-                                                </TextBlock>
-                                                <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center" Text=" m"></TextBlock>
-                                            </StackPanel>
+                                                <StackPanel Orientation="Horizontal" Margin="0 15 0 0" HorizontalAlignment="Center"  Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                                    <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
+                                                        <TextBlock.Text>
+                                                            <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0.#" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                                <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
+                                                                <Binding Path="IsSpoolView"/>
+                                                                <Binding Path="RunningJobStatus.ProgressMinusSettingUp" />
+                                                            </MultiBinding>
+                                                        </TextBlock.Text>
+                                                    </TextBlock>
+                                                    <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
+                                                    <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
+                                                        <TextBlock.Text>
+                                                            <MultiBinding Converter="{StaticResource ProgressLengthSpoolConverter}" StringFormat="0" TargetNullValue='-' FallbackValue='0' Mode="OneWay">
+                                                                <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
+                                                                <Binding Path="IsSpoolView"/>
+                                                            </MultiBinding>
+                                                        </TextBlock.Text>
+                                                    </TextBlock>
+                                                    <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center" Text=" m"></TextBlock>
+                                                </StackPanel>
 
-                                            <StackPanel Orientation="Horizontal" Margin="0 10 0 0" HorizontalAlignment="Center" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                                <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
-                                                    <TextBlock.Text>
-                                                        <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='0'>
-                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
-                                                            <Binding Path="IsSpoolView"/>
-                                                            <Binding Path="RunningJobStatus.ProgressMinusSettingUp" />
-                                                            <Binding Path="Job.GramPerLength" Mode="OneWay"/>
-                                                        </MultiBinding>
-                                                    </TextBlock.Text>
-                                                </TextBlock>
-                                                <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
-                                                <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
-                                                    <TextBlock.Text>
-                                                        <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="0.#" TargetNullValue='-' FallbackValue='0' >
-                                                            <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
-                                                            <Binding Path="IsSpoolView"/>
-                                                            <Binding Path="Job.GramPerLength" Mode="OneWay"/>
-                                                        </MultiBinding>
-                                                    </TextBlock.Text>
-                                                </TextBlock>
-                                                <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center" Text=" g"></TextBlock>
+                                                <StackPanel Orientation="Horizontal" Margin="0 10 0 0" HorizontalAlignment="Center" Visibility="{Binding IsWeghtView, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                    <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center">
+                                                        <TextBlock.Text>
+                                                            <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='0'>
+                                                                <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp" />
+                                                                <Binding Path="IsSpoolView"/>
+                                                                <Binding Path="RunningJobStatus.ProgressMinusSettingUp" />
+                                                                <Binding Path="Job.GramPerLength" Mode="OneWay"/>
+                                                            </MultiBinding>
+                                                        </TextBlock.Text>
+                                                    </TextBlock>
+                                                    <TextBlock  FontSize="{StaticResource TangoLargeInfoFontSize}" VerticalAlignment="Center" Text="/"></TextBlock>
+                                                    <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center">
+                                                        <TextBlock.Text>
+                                                            <MultiBinding Converter="{StaticResource ProgressWeightSpoolConverter}" StringFormat="0.#" TargetNullValue='-' FallbackValue='0' >
+                                                                <Binding Path="RunningJobStatus.TotalProgressMinusSettingUp"/>
+                                                                <Binding Path="IsSpoolView"/>
+                                                                <Binding Path="Job.GramPerLength" Mode="OneWay"/>
+                                                            </MultiBinding>
+                                                        </TextBlock.Text>
+                                                    </TextBlock>
+                                                    <TextBlock  FontSize="{StaticResource TangoTitleFontSize}" VerticalAlignment="Center" Text=" g"></TextBlock>
+                                                </StackPanel>
                                             </StackPanel>
-                                        </StackPanel>
 
-                                        <StackPanel Height="90" Visibility="{Binding RunningJobStatus.IsSettingUp, FallbackValue=collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                                <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
-                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Getting Ready...</TextBlock>
+                                            <StackPanel Height="90" Visibility="{Binding RunningJobStatus.IsSettingUp, FallbackValue=collapsed, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                    <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
+                                                    <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Getting Ready...</TextBlock>
+                                                </StackPanel>
                                             </StackPanel>
-                                        </StackPanel>
 
-                                        <Rectangle Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoDividerBrush}" />
+                                            <Rectangle Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoDividerBrush}" />
 
-                                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 15 0 0">
-                                            <Image Source="../Images/JobProgressView/clock.png" Stretch="None" VerticalAlignment="Center" />
-                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Time Left</TextBlock>
+                                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0 15 0 0">
+                                                <Image Source="../Images/JobProgressView/clock.png" Stretch="None" VerticalAlignment="Center" />
+                                                <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Time Left</TextBlock>
+                                            </StackPanel>
+
+                                            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoLargeInfoFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                                <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=-}"></Run>
+                                                <Run FontSize="{StaticResource TangoComboBoxItemFontSize}" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
+                                            </TextBlock>
                                         </StackPanel>
+                                    </Grid>
 
-                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoLargeInfoFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
-                                            <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=-}"></Run>
-                                            <Run FontSize="{StaticResource TangoComboBoxItemFontSize}" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
-                                        </TextBlock>
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                        <touch:TouchButton Visibility="Collapsed" Content="Abort" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding AbortCommand}" IsEnabled="true" BorderThickness="1" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" EnableDropShadow="False">
+                                            <touch:TouchButton.Style >
+                                                <Style TargetType="touch:TouchButton" >
+                                                    <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                                                    <Setter Property="Background" Value="Transparent"/>
+                                                    <Style.Triggers>
+                                                        <Trigger Property="IsEnabled" Value="False">
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
+                                                            <Setter Property="BorderBrush" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
+                                                        </Trigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </touch:TouchButton.Style>
+                                        </touch:TouchButton>
+                                        <touch:TouchButton Content="Stop" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding StopCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" EnableDropShadow="False">
+                                            <touch:TouchButton.Style >
+                                                <Style TargetType="touch:TouchButton" >
+                                                    <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}"></Setter>
+                                                    <Setter Property="Background" Value="{StaticResource TangoPrimaryAccentBrush}"/>
+                                                    <Style.Triggers>
+                                                        <Trigger Property="IsEnabled" Value="False">
+                                                            <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
+                                                            <Setter Property="Background" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
+                                                        </Trigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </touch:TouchButton.Style>
+                                        </touch:TouchButton>
                                     </StackPanel>
-                                </Grid>
-
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                    <touch:TouchButton Visibility="Collapsed" Content="Abort" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30" Command="{Binding AbortCommand}" IsEnabled="true" BorderThickness="1" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" EnableDropShadow="False">
-                                        <touch:TouchButton.Style >
-                                            <Style TargetType="touch:TouchButton" >
-                                                <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
-                                                <Setter Property="Background" Value="Transparent"/>
-                                                <Style.Triggers>
-                                                    <Trigger Property="IsEnabled" Value="False">
-                                                        <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
-                                                        <Setter Property="BorderBrush" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </touch:TouchButton.Style>
-                                    </touch:TouchButton>
-                                    <touch:TouchButton Content="Stop" Margin="0 20 0 0" Height="50" Width="164" CornerRadius="30"  Command="{Binding StopCommand}" IsEnabled="{Binding MachineProvider.MachineOperator.IsPrinting}" EnableDropShadow="False">
-                                        <touch:TouchButton.Style >
-                                            <Style TargetType="touch:TouchButton" >
-                                                <Setter Property="Foreground" Value="{StaticResource TangoLightForegroundBrush}"></Setter>
-                                                <Setter Property="Background" Value="{StaticResource TangoPrimaryAccentBrush}"/>
-                                                <Style.Triggers>
-                                                    <Trigger Property="IsEnabled" Value="False">
-                                                        <Setter Property="Foreground" Value="{StaticResource TangoDisabledForegroundBrush}"></Setter>
-                                                        <Setter Property="Background" Value="{StaticResource TangoDisabledBackgroundBrush}"></Setter>
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </touch:TouchButton.Style>
-                                    </touch:TouchButton>
                                 </StackPanel>
+                            </Grid>
+                        </DockPanel>
+                        <StackPanel x:Name="Job_Progress" Grid.Row="2" Margin="0 12 0 0" Orientation="Vertical">
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                <Image Source="../Images/Job Issues/Thread.png" Stretch="None" VerticalAlignment="Top"/>
+                                <TextBlock Text="Total Job Progress" FontWeight="DemiBold" Margin="15 10 0 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalAlignment="Top"></TextBlock>
+                                <Rectangle Height="2" Fill="{StaticResource TangoLightBorderBrush}" Width="1010" VerticalAlignment="Top" Margin="15 20 0 0"></Rectangle>
                             </StackPanel>
-                        </Grid>
-            </DockPanel>
-                <StackPanel x:Name="Job_Progress" Grid.Row="2" Margin="0 12 0 0" Orientation="Vertical">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                        <Image Source="../Images/Job Issues/Thread.png" Stretch="None" VerticalAlignment="Top"/>
-                        <TextBlock Text="Total Job Progress" FontWeight="DemiBold" Margin="15 10 0 0" FontSize="{StaticResource TangoComboBoxItemFontSize}" VerticalAlignment="Top"></TextBlock>
-                        <Rectangle Height="2" Fill="{StaticResource TangoLightBorderBrush}" Width="1010" VerticalAlignment="Top" Margin="15 20 0 0"></Rectangle>
-                    </StackPanel>
-                        <Grid Margin="0 22 0 0">
-                            <locaControls:RunningJobViewerEureka ThumbHeight="16" HeightSlider="14"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" 
-                                                                 RunningJobStatus="{Binding RunningJobStatus}"  
-                                                                 MaximumValue="{Binding RunningJobStatus.TotalProgressMinusSettingUp, FallbackValue=100,TargetNullValue=100}" 
-                                                                 MinimumValue="0"
-                                                                 SliderValue="{Binding RunningJobStatus.ProgressMinusSettingUp, TargetNullValue=0, FallbackValue=0}"/>
+                            <Grid Margin="0 22 0 0">
+                                <locaControls:RunningJobViewerEureka ThumbHeight="16" HeightSlider="14"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" 
+                                                                     RunningJobStatus="{Binding RunningJobStatus}"  
+                                                                     MaximumValue="{Binding RunningJobStatus.TotalProgressMinusSettingUp, FallbackValue=100,TargetNullValue=100}" 
+                                                                     MinimumValue="0"
+                                                                     SliderValue="{Binding RunningJobStatus.ProgressMinusSettingUp, TargetNullValue=0, FallbackValue=0}"/>
 
 
-                            <!--<TextBlock Margin="0 0 -50 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right">
-                            <Run Text="x"></Run><Run Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
-                        </TextBlock>-->
-                        </Grid>
-                        <UniformGrid DockPanel.Dock="Bottom" Columns="4" Rows="1" HorizontalAlignment="Left" Margin="0 10 0 0" Height="Auto" VerticalAlignment="Top" Width="840">
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-                                <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                    <TextBlock x:Name="ProgressLength"  VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length</TextBlock>
+                                <!--<TextBlock Margin="0 0 -50 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right">
+                                <Run Text="x"></Run><Run Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
+                            </TextBlock>-->
+                            </Grid>
+                            <UniformGrid DockPanel.Dock="Bottom" Columns="4" Rows="1" HorizontalAlignment="Left" Margin="0 10 0 0" Height="Auto" VerticalAlignment="Top" Width="840">
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <Image Source="../Images/Job Issues/job_length.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                        <TextBlock x:Name="ProgressLength"  VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Length</TextBlock>
                                         <TextBlock FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                             <TextBlock.Text>
                                                 <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
@@ -607,12 +614,12 @@
                                                 </MultiBinding>
                                             </TextBlock.Text>
                                         </TextBlock>
+                                    </StackPanel>
                                 </StackPanel>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                <Image Source="../Images/Job Issues/job_weight.png" Stretch="None" VerticalAlignment="Top"/>
-                                <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                    <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight</TextBlock>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <Image Source="../Images/Job Issues/job_weight.png" Stretch="None" VerticalAlignment="Top"/>
+                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Job Weight</TextBlock>
                                         <TextBlock   FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
                                             <TextBlock.Text>
                                                 <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
@@ -622,189 +629,189 @@
                                                 </MultiBinding>
                                             </TextBlock.Text>
                                         </TextBlock>
+                                    </StackPanel>
                                 </StackPanel>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                <Image Source="../Images/Job Issues/job_copies.png" Stretch="None" VerticalAlignment="Top"/>
-                                <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                    <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Copies</TextBlock>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <Image Source="../Images/Job Issues/job_copies.png" Stretch="None" VerticalAlignment="Top"/>
+                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Copies</TextBlock>
                                         <TextBlock Text="{Binding RunningJobStatus.CurrentUnit,TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></TextBlock>
+                                    </StackPanel>
                                 </StackPanel>
-                            </StackPanel>
-                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                                <Image Source="../Images/Job Issues/ttime_left.png" Stretch="None" VerticalAlignment="Top"/>
-                                <StackPanel Orientation="Vertical" Margin="15 0 0 0">
-                                    <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Time Left</TextBlock>
-                                    <TextBlock FontWeight="Light" FontSize="{StaticResource TangoComboBoxItemFontSize}" Margin="0 0 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>   
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                    <Image Source="../Images/Job Issues/ttime_left.png" Stretch="None" VerticalAlignment="Top"/>
+                                    <StackPanel Orientation="Vertical" Margin="15 0 0 0">
+                                        <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}">Time Left</TextBlock>
+                                        <TextBlock FontWeight="Light" FontSize="{StaticResource TangoComboBoxItemFontSize}" Margin="0 0 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>   
                                             
-                                                <!--<Run FontSize="16">m</Run>-->
-                                    </TextBlock>
+                                                    <!--<Run FontSize="16">m</Run>-->
+                                        </TextBlock>
+                                    </StackPanel>
                                 </StackPanel>
-                            </StackPanel>
-                        </UniformGrid>
+                            </UniformGrid>
 
-                </StackPanel>
-                <Grid Grid.Row="3" Margin="0 15 0 0" >
+                        </StackPanel>
+                        <Grid Grid.Row="3" Margin="0 15 0 0" >
 
-                    <Rectangle Fill="{StaticResource TangoLightBorderBrush}" Height="2" VerticalAlignment="Top"></Rectangle>
-                    <Grid Margin="0 30 0 0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*"/>
-                            <ColumnDefinition Width="2*"/>
-                        </Grid.ColumnDefinitions>
-                        <StackPanel Orientation="Vertical">
-                            <StackPanel Orientation="Horizontal">
-                                <Image Source="../Images/Job Issues/input.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
-                                <TextBlock VerticalAlignment="Center" Margin="15 0 0 0" FontSize="{StaticResource TangoDefaultFontSize}">Input</TextBlock>
-                            </StackPanel>
-                                <UniformGrid Margin="0 20 0 0" Rows="1" Columns="3" Height="Auto" MinWidth="180" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                    <StackPanel Orientation="Vertical">
-                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                        <TextBlock Margin="0 10 0 0 " Text="L" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
-                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
-                                       
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left" Margin="5 0 0 0">
-                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                        <TextBlock  Margin="0 10 0 0 " Text="a" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
-                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical" Margin="10 0 0 0" Width="50">
-                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                        <TextBlock  Margin="0 10 0 0 " Text="b" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
-                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
-                                    </StackPanel>
-                                </UniformGrid>
-                                <Grid Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <ContentControl x:Name="leftBrushValues" HorizontalAlignment="Left" Content="{Binding CurrentBrushStop}" Width="Auto"  Height="Auto"  Margin="0 20 0 0">
-                                        <ContentControl.Style>
-                                            <Style TargetType="ContentControl">
-                                                <Setter Property="ContentTemplate">
-                                                    <Setter.Value>
-                                                        <DataTemplate/>
-                                                    </Setter.Value>
-                                                </Setter>
-                                                <Style.Triggers>
-                                                    <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name, Converter={StaticResource EnumToDescriptionConverter}}" Value="RGB">
-                                                    <Setter Property="ContentTemplate" Value="{StaticResource RGB_Template}" />
-                                                </DataTrigger>
-                                                    <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name, Converter={StaticResource EnumToDescriptionConverter}}" Value="Volume">
-                                                    <Setter Property="ContentTemplate" Value="{StaticResource CMYK_Template}" />
-                                                </DataTrigger>
-                                                    <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name}" Value="LAB">
-                                                        <Setter Property="ContentTemplate" Value="{StaticResource LAB_Template}" />
-                                                    </DataTrigger>
-                                                    <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name, Converter={StaticResource EnumToDescriptionConverter}}" Value="Catalog">
-                                                    <Setter Property="ContentTemplate" Value="{StaticResource CATALOG_Template}" />
-                                                </DataTrigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </ContentControl.Style>
-                                    </ContentControl>
-                                </Grid>
-                            </StackPanel>
-                        <StackPanel Orientation="Vertical"  Grid.Column="1" Margin="60 0 0 0">
-                            <StackPanel Orientation="Horizontal">
-                                <Image Source="../Images/Job Issues/output.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"  Height="Auto"/>
-                                <TextBlock VerticalAlignment="Center" Margin="15 0 0 0" FontSize="{StaticResource TangoDefaultFontSize}" >Output</TextBlock>
-                            </StackPanel>
-                                <UniformGrid Margin="0 20 0 0" Rows="1" Columns="7" Height="Auto" Width="435" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                                    <StackPanel Orientation="Vertical">
-                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical">
-                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical">
-                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical">
-                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical">
-                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical">
-                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical">
-                                        <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
-                                        <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
-                                    </StackPanel>
-                                </UniformGrid>
-                                <UniformGrid Columns="7" Rows="1" Margin="0 20 0 0" Width="440" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                        <Border Width="50" Height="50" Background="Cyan" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">C</TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding CyanOutput}"></TextBlock>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                        <Border Width="50" Height="50" Background="LightCyan" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LC</TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding LightCyanOutput}"></TextBlock>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                        <Border Width="50" Height="50" Background="Magenta" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">M</TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding MagentaOutput}"></TextBlock>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                        <Border Width="50" Height="50" Background="LightPink" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LM</TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding LightMagentaOutput}"></TextBlock>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                        <Border Width="50" Height="50" Background="Yellow" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">Y</TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding YellowOutput}"></TextBlock>
-                                    </StackPanel>
-                                    <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                        <Border Width="50" Height="50" Background="LightYellow" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LY</TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding LightYellowOutput}"></TextBlock>
+                            <Rectangle Fill="{StaticResource TangoLightBorderBrush}" Height="2" VerticalAlignment="Top"></Rectangle>
+                            <Grid Margin="0 30 0 0">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*"/>
+                                    <ColumnDefinition Width="2*"/>
+                                </Grid.ColumnDefinitions>
+                                <StackPanel Orientation="Vertical">
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Source="../Images/Job Issues/input.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"/>
+                                        <TextBlock VerticalAlignment="Center" Margin="15 0 0 0" FontSize="{StaticResource TangoDefaultFontSize}">Input</TextBlock>
                                     </StackPanel>
-                                    <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
-                                        <Border Width="50" Height="50" Background="Black" CornerRadius="16" HorizontalAlignment="Left"></Border>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">K</TextBlock>
-                                        <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding BlackOutput}"></TextBlock>
+                                    <UniformGrid Margin="0 20 0 0" Rows="1" Columns="3" Height="Auto" MinWidth="180" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                        <StackPanel Orientation="Vertical">
+                                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
+                                            <TextBlock Margin="0 10 0 0 " Text="L" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
+                                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left" Margin="5 0 0 0">
+                                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
+                                            <TextBlock  Margin="0 10 0 0 " Text="a" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
+                                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical" Margin="10 0 0 0" Width="50">
+                                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
+                                            <TextBlock  Margin="0 10 0 0 " Text="b" FontSize="{StaticResource TangoSmallFontSize}"  HorizontalAlignment="Center"/>
+                                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                        </StackPanel>
+                                    </UniformGrid>
+                                    <Grid Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <ContentControl x:Name="leftBrushValues" HorizontalAlignment="Left" Content="{Binding CurrentBrushStop}" Width="Auto"  Height="Auto"  Margin="0 20 0 0">
+                                            <ContentControl.Style>
+                                                <Style TargetType="ContentControl">
+                                                    <Setter Property="ContentTemplate">
+                                                        <Setter.Value>
+                                                            <DataTemplate/>
+                                                        </Setter.Value>
+                                                    </Setter>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name, Converter={StaticResource EnumToDescriptionConverter}}" Value="RGB">
+                                                            <Setter Property="ContentTemplate" Value="{StaticResource RGB_Template}" />
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name, Converter={StaticResource EnumToDescriptionConverter}}" Value="Volume">
+                                                            <Setter Property="ContentTemplate" Value="{StaticResource CMYK_Template}" />
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name}" Value="LAB">
+                                                            <Setter Property="ContentTemplate" Value="{StaticResource LAB_Template}" />
+                                                        </DataTrigger>
+                                                        <DataTrigger Binding="{Binding CurrentBrushStop.ColorSpace.Name, Converter={StaticResource EnumToDescriptionConverter}}" Value="Catalog">
+                                                            <Setter Property="ContentTemplate" Value="{StaticResource CATALOG_Template}" />
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </ContentControl.Style>
+                                        </ContentControl>
+                                    </Grid>
+                                </StackPanel>
+                                <StackPanel Orientation="Vertical"  Grid.Column="1" Margin="60 0 0 0">
+                                    <StackPanel Orientation="Horizontal">
+                                        <Image Source="../Images/Job Issues/output.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left"  Height="Auto"/>
+                                        <TextBlock VerticalAlignment="Center" Margin="15 0 0 0" FontSize="{StaticResource TangoDefaultFontSize}" >Output</TextBlock>
                                     </StackPanel>
-                                </UniformGrid>
-                            </StackPanel>
+                                    <UniformGrid Margin="0 20 0 0" Rows="1" Columns="7" Height="Auto" Width="435" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                        <StackPanel Orientation="Vertical">
+                                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
+                                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical">
+                                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
+                                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical">
+                                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
+                                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical">
+                                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
+                                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical">
+                                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
+                                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical">
+                                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
+                                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical">
+                                            <Border Width="50" Height="50" Background="Transparent" CornerRadius="16" HorizontalAlignment="Left" BorderBrush="{StaticResource TangoDisabledForegroundBrush}" BorderThickness="1"></Border>
+                                            <TextBlock Margin="0 10 0 0 " Style="{StaticResource SliderGreyTextStyle}" Text="-" ></TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
+                                        </StackPanel>
+                                    </UniformGrid>
+                                    <UniformGrid Columns="7" Rows="1" Margin="0 20 0 0" Width="440" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                                            <Border Width="50" Height="50" Background="Cyan" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">C</TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding CyanOutput}"></TextBlock>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                                            <Border Width="50" Height="50" Background="LightCyan" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LC</TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding LightCyanOutput}"></TextBlock>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                                            <Border Width="50" Height="50" Background="Magenta" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">M</TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding MagentaOutput}"></TextBlock>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                                            <Border Width="50" Height="50" Background="LightPink" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LM</TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding LightMagentaOutput}"></TextBlock>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                                            <Border Width="50" Height="50" Background="Yellow" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">Y</TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding YellowOutput}"></TextBlock>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                                            <Border Width="50" Height="50" Background="LightYellow" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">LY</TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding LightYellowOutput}"></TextBlock>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical" Width="50" HorizontalAlignment="Left">
+                                            <Border Width="50" Height="50" Background="Black" CornerRadius="16" HorizontalAlignment="Left"></Border>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center">K</TextBlock>
+                                            <TextBlock Margin="0 10 0 0 " HorizontalAlignment="Center" Text="{Binding BlackOutput}"></TextBlock>
+                                        </StackPanel>
+                                    </UniformGrid>
+                                </StackPanel>
 
+                            </Grid>
+                        </Grid>
                     </Grid>
-                </Grid>
-            </Grid>
 
-                <Grid x:Name="Overview" Margin="32 18 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="74"></RowDefinition>
-                        <RowDefinition Height="Auto"></RowDefinition>
-                        <RowDefinition Height="Auto"></RowDefinition>
-                        <RowDefinition Height="Auto"></RowDefinition>
-                        <RowDefinition Height="100"></RowDefinition>
-                    </Grid.RowDefinitions>
-                    <Grid Margin="0 10 0 0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="1*"/>
-                            <ColumnDefinition Width="400"/>
-                            <ColumnDefinition Width="Auto"/>
-                        </Grid.ColumnDefinitions>
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" >
+                    <Grid x:Name="Overview" Margin="32 18 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="74"></RowDefinition>
+                            <RowDefinition Height="Auto"></RowDefinition>
+                            <RowDefinition Height="Auto"></RowDefinition>
+                            <RowDefinition Height="Auto"></RowDefinition>
+                            <RowDefinition Height="100"></RowDefinition>
+                        </Grid.RowDefinitions>
+                        <Grid Margin="0 10 0 0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*"/>
+                                <ColumnDefinition Width="400"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" >
                                 <Image Margin="0 2 0 0" Source="../Images/Job Issues/job_length.png" Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Left" Width="Auto" Height="32" />
                                 <TextBlock Margin="20 10 0 0" Width="50"  FontWeight="SemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}" >
                                     <TextBlock.Text>
@@ -814,21 +821,21 @@
                                         </MultiBinding>
                                     </TextBlock.Text>
                                 </TextBlock>
-                        </StackPanel>
-                        <!--<Grid Grid.Column="1"  Margin="20 8 20 0" VerticalAlignment="Top" Height="20">-->
-                        <locaControls:RunningJobViewerEureka Grid.Column="1" Margin="20 12 20 0"  VerticalAlignment="Top" ThumbHeight="16" Height="14"  HeightSlider="14"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" 
-                                                                 RunningJobStatus="{Binding RunningJobStatus}"  
-                                                                 MaximumValue="{Binding RunningJobStatus.TotalProgressMinusSettingUp, FallbackValue=100,TargetNullValue=100}" 
-                                                                 MinimumValue="0"
-                                                                 SliderValue="{Binding RunningJobStatus.ProgressMinusSettingUp, TargetNullValue=0, FallbackValue=0, Delay=100}"/>
+                            </StackPanel>
+                            <!--<Grid Grid.Column="1"  Margin="20 8 20 0" VerticalAlignment="Top" Height="20">-->
+                            <locaControls:RunningJobViewerEureka Grid.Column="1" Margin="20 12 20 0"  VerticalAlignment="Top" ThumbHeight="16" Height="14"  HeightSlider="14"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" 
+                                                                     RunningJobStatus="{Binding RunningJobStatus}"  
+                                                                     MaximumValue="{Binding RunningJobStatus.TotalProgressMinusSettingUp, FallbackValue=100,TargetNullValue=100}" 
+                                                                     MinimumValue="0"
+                                                                     SliderValue="{Binding RunningJobStatus.ProgressMinusSettingUp, TargetNullValue=0, FallbackValue=0, Delay=100}"/>
+
+                            <!--</Grid>-->
 
-                        <!--</Grid>-->
-                        
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Grid.Column="2" Margin="0 0 0 0">
-                            <Image Margin="0 2 0 0" Source="../Images/Job Issues/ttime_left.png" Stretch="Uniform" VerticalAlignment="Top" Height="32"/>
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Grid.Column="2" Margin="0 0 0 0">
+                                <Image Margin="0 2 0 0" Source="../Images/Job Issues/ttime_left.png" Stretch="Uniform" VerticalAlignment="Top" Height="32"/>
                                 <TextBlock Margin="15 10 0 0" FontWeight="Light" FontSize="{StaticResource TangoComboBoxItemFontSize}"  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>
+                                                <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>
                                 <touch:TouchButton Content="Stop"  Height="50" Width="164" CornerRadius="30" Command="{Binding StopCommand}" IsEnabled="true" BorderThickness="0" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" EnableDropShadow="False" VerticalAlignment="Top" Margin="20 -5 0 0">
@@ -847,328 +854,342 @@
                                 </touch:TouchButton>
 
                             </StackPanel>
-                        
-                        <Border Height="2" Grid.ColumnSpan="012" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
-                    </Grid>
-                    <Grid Grid.Row="1" Margin="0 28 0 0">
-                        <StackPanel Orientation="Vertical">
-                            <StackPanel Orientation="Horizontal" >
-                                <Image Source="../Images/Overview Icons/Sensors.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/>
-                                <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Sensors</TextBlock>
-                            </StackPanel>
-                            <UniformGrid Columns="5" Rows="1" Height="120" Margin="40 11 40 0" DataContext="{Binding OverviewModel}">
-                                <StackPanel Orientation="Vertical">
-                                <Grid>
-                                        <touch:TouchArcProgress  RingThickness="8" Value="{Binding DryerZone3.Value}" Maximum="{Binding DryerZone3.MaxValue}" Minimum="0" Width="100" Height="100">
-                                            <touch:TouchArcProgress.Foreground>
-                                                <SolidColorBrush Color="{Binding DryerZone3.Color}"/>
-                                            </touch:TouchArcProgress.Foreground>
-                                        </touch:TouchArcProgress>
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Bold" Text="{Binding DryerZone3.DisplayValue}">
-                                            <TextBlock.Foreground>
-                                                <SolidColorBrush Color="{Binding DryerZone3.Color}"/>
-                                            </TextBlock.Foreground>
-                                        </TextBlock>
-                                        <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" >&#186;C</TextBlock>
 
-                                </Grid>
-                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Zone 3</TextBlock>
-                                </StackPanel>
-                                
-                                <StackPanel Orientation="Vertical">
-                                <Grid>
-                                        <touch:TouchArcProgress RingThickness="8" Value="{Binding DryerAir.Value}" Maximum="{Binding DryerAir.MaxValue}" Minimum="0" Width="100" Height="100">
-                                            <touch:TouchArcProgress.Foreground>
-                                                <SolidColorBrush Color="{Binding DryerAir.Color}"/>
-                                            </touch:TouchArcProgress.Foreground>
-                                        </touch:TouchArcProgress>
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding DryerAir.DisplayValue}">
-                                            <TextBlock.Foreground>
-                                                <SolidColorBrush Color="{Binding DryerAir.Color}"/>
-                                            </TextBlock.Foreground>
-                                        </TextBlock>
-                                        <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C" >
-                                        </TextBlock>
-                                </Grid>
-                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Air</TextBlock>
-                                </StackPanel>
-                                <StackPanel Orientation="Vertical">
-                                    <Grid>
-                                        <touch:TouchArcProgress  RingThickness="8" Value="{Binding Tunnel.Value}" Maximum="{Binding Tunnel.MaxValue}" Minimum="0" Width="100" Height="100">
-                                            <touch:TouchArcProgress.Foreground>
-                                                <SolidColorBrush Color="{Binding Tunnel.Color}"/>
-                                            </touch:TouchArcProgress.Foreground>
-                                        </touch:TouchArcProgress>
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding Tunnel.DisplayValue}">
-                                            <TextBlock.Foreground>
-                                                <SolidColorBrush Color="{Binding Tunnel.Color}"/>
-                                            </TextBlock.Foreground>
-                                        </TextBlock>
-                                    <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C"></TextBlock>
-
-                                </Grid>
-                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Tunnel</TextBlock>
+                            <Border Height="2" Grid.ColumnSpan="012" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
+                        </Grid>
+                        <Grid Grid.Row="1" Margin="0 28 0 0">
+                            <StackPanel Orientation="Vertical">
+                                <StackPanel Orientation="Horizontal" >
+                                    <Image Source="../Images/Overview Icons/Sensors.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/>
+                                    <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Sensors</TextBlock>
                                 </StackPanel>
-                                <StackPanel Orientation="Vertical">
-                                    <Grid>
-                                        <touch:TouchArcProgress  RingThickness="8" Value="{Binding PumpsPressure.Value}" Maximum="{Binding PumpsPressure.MaxValue}" Minimum="0" Width="100" Height="100">
-                                            <touch:TouchArcProgress.Foreground>
-                                                <SolidColorBrush Color="{Binding PumpsPressure.Color}"/>
-                                            </touch:TouchArcProgress.Foreground>
-                                        </touch:TouchArcProgress>
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding PumpsPressure.DisplayValue}">
-                                            <TextBlock.Foreground>
-                                                <SolidColorBrush Color="{Binding PumpsPressure.Color}"/>
-                                            </TextBlock.Foreground>
-                                        </TextBlock>
-                                    <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="Bar"></TextBlock>
+                                <UniformGrid Columns="5" Rows="1" Height="120" Margin="40 11 40 0" DataContext="{Binding OverviewModel}">
+                                    <StackPanel Orientation="Vertical">
+                                        <Grid>
+                                            <touch:TouchArcProgress  RingThickness="8" Value="{Binding DryerZone3.Value}" Maximum="{Binding DryerZone3.MaxValue}" Minimum="0" Width="100" Height="100">
+                                                <touch:TouchArcProgress.Foreground>
+                                                    <SolidColorBrush Color="{Binding DryerZone3.Color}"/>
+                                                </touch:TouchArcProgress.Foreground>
+                                            </touch:TouchArcProgress>
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Bold" Text="{Binding DryerZone3.DisplayValue}">
+                                                <TextBlock.Foreground>
+                                                    <SolidColorBrush Color="{Binding DryerZone3.Color}"/>
+                                                </TextBlock.Foreground>
+                                            </TextBlock>
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" >&#186;C</TextBlock>
 
-                                </Grid>
-                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Pumps pressure</TextBlock>
-                                </StackPanel>
-                                <StackPanel Orientation="Vertical">
-                                    <Grid>
-                                        <touch:TouchArcProgress  RingThickness="8" Value="{Binding Lubricant.Value}" Maximum="{Binding Lubricant.MaxValue}" Minimum="0" Width="100" Height="100">
-                                            <touch:TouchArcProgress.Foreground>
-                                                <SolidColorBrush Color="{Binding Lubricant.Color}"/>
-                                            </touch:TouchArcProgress.Foreground>
-                                        </touch:TouchArcProgress>
-                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding Lubricant.DisplayValue}">
-                                            <TextBlock.Foreground>
-                                                <SolidColorBrush Color="{Binding Lubricant.Color}"/>
-                                            </TextBlock.Foreground>
-                                        </TextBlock>
-                                        <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="mVolts"></TextBlock>
+                                        </Grid>
+                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Zone 3</TextBlock>
+                                    </StackPanel>
 
-                                </Grid>
-                                    <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Lubricant</TextBlock>
-                                </StackPanel>
-                            </UniformGrid>
-                            <Grid  Margin="0 23 0 0">
-                                <Image Source="../Images/Job Issues/Machine outline.png" Height="188" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Center" Width="636" />
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                     <StackPanel Orientation="Vertical">
-                                        <Border Height="184" Width="83" VerticalAlignment="Center" CornerRadius="2 0 0 2" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
-                                            <UniformGrid Columns="1" Rows="4" Margin="24">
-                                                <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" >
-                                                    <!--<Image.Style>
-                                                        <Style>
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding Job.BTSR}}" Value="True">
-                                                                    <Setter Property="Image.Source" Value="../Images/Overview Icons/Error.png"/>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Image.Style>-->
-                                                </Image>
-                                                <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
-                                                <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
-                                                <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
-                                            </UniformGrid>
-                                        </Border>
-                                        <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0" FontWeight="Thin">Winder</TextBlock>
+                                        <Grid>
+                                            <touch:TouchArcProgress RingThickness="8" Value="{Binding DryerAir.Value}" Maximum="{Binding DryerAir.MaxValue}" Minimum="0" Width="100" Height="100">
+                                                <touch:TouchArcProgress.Foreground>
+                                                    <SolidColorBrush Color="{Binding DryerAir.Color}"/>
+                                                </touch:TouchArcProgress.Foreground>
+                                            </touch:TouchArcProgress>
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding DryerAir.DisplayValue}">
+                                                <TextBlock.Foreground>
+                                                    <SolidColorBrush Color="{Binding DryerAir.Color}"/>
+                                                </TextBlock.Foreground>
+                                            </TextBlock>
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C" >
+                                            </TextBlock>
+                                        </Grid>
+                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dryer Air</TextBlock>
                                     </StackPanel>
                                     <StackPanel Orientation="Vertical">
-                                        <Border Height="171" Width="95" VerticalAlignment="Center" CornerRadius="0" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
-                                            <UniformGrid Columns="1" Rows="4" Margin="0 21 0 9" VerticalAlignment="Stretch">
-                                                <Image  Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" >
-                                                    <!--<Image.Style>
-                                                        <Style>
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding Job.BTSR}}" Value="True">
-                                                                    <Setter Property="Image.Source" Value="../Images/Overview Icons/Error.png"/>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Image.Style>-->
-                                                </Image>
-                                                <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
-                                                <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
-                                                <Image  Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
-                                            </UniformGrid>
-                                        </Border>
-                                        <TextBlock HorizontalAlignment="Center" Margin="14 18 14 14" FontWeight="Thin">Dancer</TextBlock>
-                                    </StackPanel>
-
+                                        <Grid>
+                                            <touch:TouchArcProgress  RingThickness="8" Value="{Binding Tunnel.Value}" Maximum="{Binding Tunnel.MaxValue}" Minimum="0" Width="100" Height="100">
+                                                <touch:TouchArcProgress.Foreground>
+                                                    <SolidColorBrush Color="{Binding Tunnel.Color}"/>
+                                                </touch:TouchArcProgress.Foreground>
+                                            </touch:TouchArcProgress>
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding Tunnel.DisplayValue}">
+                                                <TextBlock.Foreground>
+                                                    <SolidColorBrush Color="{Binding Tunnel.Color}"/>
+                                                </TextBlock.Foreground>
+                                            </TextBlock>
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C"></TextBlock>
 
-                                    <StackPanel Orientation="Vertical" Margin="274 0 0 0">
-                                        <Border Height="171" Width="95" VerticalAlignment="Center" CornerRadius="0" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
-                                            <UniformGrid Columns="1" Rows="4" Margin="0 21 0 9" VerticalAlignment="Stretch">
-                                                <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" >
-                                                    <!--<Image.Style>
-                                                        <Style>
-                                                            <Style.Triggers>
-                                                                <DataTrigger Binding="{Binding Job.BTSR}}" Value="True">
-                                                                    <Setter Property="Image.Source" Value="../Images/Overview Icons/Error.png"/>
-                                                                </DataTrigger>
-                                                            </Style.Triggers>
-                                                        </Style>
-                                                    </Image.Style>-->
-                                                </Image>
-                                                <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
-                                                <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
-                                                <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
-                                            </UniformGrid>
-                                        </Border>
-                                        <TextBlock HorizontalAlignment="Center" Margin="0 18 0 0" FontWeight="Thin">BTSR</TextBlock>
+                                        </Grid>
+                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Tunnel</TextBlock>
                                     </StackPanel>
                                     <StackPanel Orientation="Vertical">
-                                        <Border Height="184" Width="83" VerticalAlignment="Center" CornerRadius="2 0 0 2" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
-                                            <UniformGrid Columns="1" Rows="4" Margin="24">
-                                                <Image Stretch="Fill" Width="20"  Height="24" Source="../Images/Overview Icons/Feeder1.png"  HorizontalAlignment="Center" >
-                                                    
-                                                </Image>
-                                                <Image Stretch="Fill" Width="20"  Height="24" Source="../Images/Overview Icons/Feeder2.png"  HorizontalAlignment="Center" ></Image>
-                                                <Image Stretch="Fill" Width="20"  Height="24" Source="../Images/Overview Icons/Feeder3.png"  HorizontalAlignment="Center" ></Image>
-                                                <Image Stretch="Fill" Width="20"  Height="24" Source="../Images/Overview Icons/Feeder4.png"  HorizontalAlignment="Center" ></Image>
-                                            </UniformGrid>
-                                        </Border>
-                                        <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0" FontWeight="Thin">Feeder</TextBlock>
+                                        <Grid>
+                                            <touch:TouchArcProgress  RingThickness="8" Value="{Binding PumpsPressure.Value}" Maximum="{Binding PumpsPressure.MaxValue}" Minimum="0" Width="100" Height="100">
+                                                <touch:TouchArcProgress.Foreground>
+                                                    <SolidColorBrush Color="{Binding PumpsPressure.Color}"/>
+                                                </touch:TouchArcProgress.Foreground>
+                                            </touch:TouchArcProgress>
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding PumpsPressure.DisplayValue}">
+                                                <TextBlock.Foreground>
+                                                    <SolidColorBrush Color="{Binding PumpsPressure.Color}"/>
+                                                </TextBlock.Foreground>
+                                            </TextBlock>
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="Bar"></TextBlock>
+
+                                        </Grid>
+                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Pumps pressure</TextBlock>
                                     </StackPanel>
-                                </StackPanel>
-                            </Grid>
-                        </StackPanel>
-                    </Grid>
-                    <Grid Grid.Row="2" x:Name="IncLevels" Margin="0 8 0 0" Height="196">
-                        <StackPanel Orientation="Vertical">
-                        <DockPanel>
-                                <StackPanel Orientation="Vertical" DockPanel.Dock="Right" Margin="0 0 30 0" >
-                                    <StackPanel Orientation="Horizontal" >
-                                        <Image Source="../Images/Overview Icons/Waste.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/>
-                                        <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Waste</TextBlock>
+                                    <StackPanel Orientation="Vertical">
+                                        <Grid>
+                                            <touch:TouchArcProgress  RingThickness="8" Value="{Binding Lubricant.Value}" Maximum="{Binding Lubricant.MaxValue}" Minimum="0" Width="100" Height="100">
+                                                <touch:TouchArcProgress.Foreground>
+                                                    <SolidColorBrush Color="{Binding Lubricant.Color}"/>
+                                                </touch:TouchArcProgress.Foreground>
+                                            </touch:TouchArcProgress>
+                                            <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="{Binding Lubricant.DisplayValue}">
+                                                <TextBlock.Foreground>
+                                                    <SolidColorBrush Color="{Binding Lubricant.Color}"/>
+                                                </TextBlock.Foreground>
+                                            </TextBlock>
+                                            <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="mVolts"></TextBlock>
+
+                                        </Grid>
+                                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Lubricant</TextBlock>
                                     </StackPanel>
-                                    <StackPanel Orientation="Horizontal" Margin="-25 24 0 0">
-                                        <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="-15 15 0 0"/>
-                                        <ContentControl Margin="20 0 0 0" ContentTemplate="{StaticResource WasteBox}" Content="{Binding}" IsTabStop="False"/>
+                                </UniformGrid>
+                                <Grid  Margin="0 23 0 0">
+                                    <Image Source="../Images/Job Issues/Machine outline.png" Height="188" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Center" Width="636" />
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                        <StackPanel Orientation="Vertical">
+                                            <Border Height="184" Width="83" VerticalAlignment="Center" CornerRadius="2 0 0 2" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
+                                                <UniformGrid Columns="1" Rows="4" Margin="24">
+                                                    <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" >
+                                                        <!--<Image.Style>
+                                                            <Style>
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding Job.BTSR}}" Value="True">
+                                                                        <Setter Property="Image.Source" Value="../Images/Overview Icons/Error.png"/>
+                                                                    </DataTrigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </Image.Style>-->
+                                                    </Image>
+                                                    <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
+                                                    <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
+                                                    <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
+                                                </UniformGrid>
+                                            </Border>
+                                            <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0" FontWeight="Thin">Winder</TextBlock>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical">
+                                            <Border Height="171" Width="95" VerticalAlignment="Center" CornerRadius="0" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
+                                                <UniformGrid Columns="1" Rows="4" Margin="0 21 0 9" VerticalAlignment="Stretch">
+                                                    <Image  Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" >
+                                                        <!--<Image.Style>
+                                                            <Style>
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding Job.BTSR}}" Value="True">
+                                                                        <Setter Property="Image.Source" Value="../Images/Overview Icons/Error.png"/>
+                                                                    </DataTrigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </Image.Style>-->
+                                                    </Image>
+                                                    <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
+                                                    <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
+                                                    <Image  Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
+                                                </UniformGrid>
+                                            </Border>
+                                            <TextBlock HorizontalAlignment="Center" Margin="14 18 14 14" FontWeight="Thin">Dancer</TextBlock>
+                                        </StackPanel>
+
+
+                                        <StackPanel Orientation="Vertical" Margin="274 0 0 0">
+                                            <Border Height="171" Width="95" VerticalAlignment="Center" CornerRadius="0" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
+                                                <UniformGrid Columns="1" Rows="4" Margin="0 21 0 9" VerticalAlignment="Stretch">
+                                                    <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" >
+                                                        <!--<Image.Style>
+                                                            <Style>
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding Job.BTSR}}" Value="True">
+                                                                        <Setter Property="Image.Source" Value="../Images/Overview Icons/Error.png"/>
+                                                                    </DataTrigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </Image.Style>-->
+                                                    </Image>
+                                                    <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
+                                                    <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
+                                                    <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
+                                                </UniformGrid>
+                                            </Border>
+                                            <TextBlock HorizontalAlignment="Center" Margin="0 18 0 0" FontWeight="Thin">BTSR</TextBlock>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical">
+                                            <Border Height="184" Width="83" VerticalAlignment="Center" CornerRadius="2 0 0 2" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}">
+                                                <UniformGrid Columns="1" Rows="4" Margin="24">
+                                                    <Image Stretch="Fill" Width="20"  Height="24" Source="../Images/Overview Icons/Feeder1.png"  HorizontalAlignment="Center" >
+
+                                                    </Image>
+                                                    <Image Stretch="Fill" Width="20"  Height="24" Source="../Images/Overview Icons/Feeder2.png"  HorizontalAlignment="Center" ></Image>
+                                                    <Image Stretch="Fill" Width="20"  Height="24" Source="../Images/Overview Icons/Feeder3.png"  HorizontalAlignment="Center" ></Image>
+                                                    <Image Stretch="Fill" Width="20"  Height="24" Source="../Images/Overview Icons/Feeder4.png"  HorizontalAlignment="Center" ></Image>
+                                                </UniformGrid>
+                                            </Border>
+                                            <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0" FontWeight="Thin">Feeder</TextBlock>
+                                        </StackPanel>
                                     </StackPanel>
+                                </Grid>
+                            </StackPanel>
+                        </Grid>
+                        <Grid Grid.Row="2" x:Name="IncLevels" Margin="0 8 0 0" Height="196">
+                            <StackPanel Orientation="Vertical">
+                                <DockPanel>
+                                    <StackPanel Orientation="Vertical" DockPanel.Dock="Right" Margin="0 0 30 0" >
+                                        <StackPanel Orientation="Horizontal" >
+                                            <Image Source="../Images/Overview Icons/Waste.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/>
+                                            <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Waste</TextBlock>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Horizontal" Margin="-25 24 0 0">
+                                            <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="-15 15 0 0"/>
+                                            <ContentControl Margin="20 0 0 0" ContentTemplate="{StaticResource WasteBox}" Content="{Binding}" IsTabStop="False"/>
+                                        </StackPanel>
 
-                                </StackPanel>
-                                <StackPanel Orientation="Vertical">
-                                    <StackPanel Orientation="Horizontal" >
-                                        <Image Source="../Images/Overview Icons/Inks.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/>
-                                        <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Ink Levels</TextBlock>
                                     </StackPanel>
-                                    <StackPanel Orientation="Horizontal" Margin="0 24 0 0">
-                                        <ItemsControl ItemsSource="{Binding MidTankLevels}" ItemTemplate="{StaticResource LiquidBox}">
-                                            <ItemsControl.ItemsPanel>
-                                                <ItemsPanelTemplate>
-                                                    <UniformGrid Rows="1" IsItemsHost="True" Width="550"></UniformGrid>
-                                                </ItemsPanelTemplate>
-                                            </ItemsControl.ItemsPanel>
-                                        </ItemsControl>
+                                    <StackPanel Orientation="Vertical">
+                                        <StackPanel Orientation="Horizontal" >
+                                            <Image Source="../Images/Overview Icons/Inks.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/>
+                                            <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Ink Levels</TextBlock>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Horizontal" Margin="0 24 0 0">
+                                            <ItemsControl ItemsSource="{Binding MidTankLevels}" ItemTemplate="{StaticResource LiquidBox}">
+                                                <ItemsControl.ItemsPanel>
+                                                    <ItemsPanelTemplate>
+                                                        <UniformGrid Rows="1" IsItemsHost="True" Width="550"></UniformGrid>
+                                                    </ItemsPanelTemplate>
+                                                </ItemsControl.ItemsPanel>
+                                            </ItemsControl>
 
-                                        <!--<Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="12 15 0 0"/>
-                                        <ContentControl Margin="45 0 0 0" ContentTemplate="{StaticResource LubBox}" Content="{Binding}" IsTabStop="False"/>-->
+                                            <!--<Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="12 15 0 0"/>
+                                            <ContentControl Margin="45 0 0 0" ContentTemplate="{StaticResource LubBox}" Content="{Binding}" IsTabStop="False"/>-->
+                                        </StackPanel>
                                     </StackPanel>
-                                </StackPanel>
-                        </DockPanel>
-                       
-                        </StackPanel>
-                         <Border VerticalAlignment="Bottom" Height="2" Background="{StaticResource TangoLightBorderBrush}"   Margin="0 0 0 0" CornerRadius="2"></Border>
+                                </DockPanel>
+
+                            </StackPanel>
+                            <Border VerticalAlignment="Bottom" Height="2" Background="{StaticResource TangoLightBorderBrush}"   Margin="0 0 0 0" CornerRadius="2"></Border>
+                        </Grid>
                     </Grid>
                 </Grid>
             </Grid>
-        </Grid>
-        <Grid VerticalAlignment="Bottom" Grid.ColumnSpan="2" Margin="10 0 0 0">
-            <touch:TouchExpander x:Name="Notifications" Style="{StaticResource TouchRoundedExpander}"  IsTabStop="False" KeyboardNavigation.TabNavigation ="None" BorderThickness="0" IsExpanded="false" CornerRadius="20 20 0 0" >
-                <touch:TouchExpander.Header>
-                    <DockPanel >
-                        <touch:TouchButton Margin="0 0 20 0" Content="Clear All" DockPanel.Dock="Right" Width="120"  Height="38"  HorizontalAlignment="Right" VerticalAlignment="Center" EnableDropShadow="False"  Background="Transparent" BorderThickness="1" CornerRadius="19"  BorderBrush="{StaticResource TangoPrimaryAccentBrush}" Foreground="{StaticResource TangoPrimaryAccentBrush}" Command="{Binding ClearAllNotificationsCommand}" Visibility="{Binding NotificationProvider.HasNotificationItems, Converter={StaticResource BooleanToVisibilityConverter}}" >
-                           
-                        </touch:TouchButton>
-                        <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" VerticalAlignment="Center"  >
-                            <Image Source="../Images/Job Issues/Events.png" MaxWidth="33" Stretch="Fill" Height="36"/>
-                            <TextBlock VerticalAlignment="Center" Margin="20 4 0 0" FontWeight="SemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">Notifications</TextBlock>
-                            <TextBlock  Margin="10 0 0 0" VerticalAlignment="Center" FontWeight="Normal" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding NotificationProvider.HasNotificationItems, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                <Run Text="(" ></Run>
-                                <Run Text="{Binding NotificationProvider.NotificationItems, Mode=OneWay, Converter={StaticResource CollectionToCountConverter}}"></Run>
-                                <Run Text=" new Events)" ></Run>
-                            </TextBlock>
-                        </StackPanel>
-                    </DockPanel>
-                </touch:TouchExpander.Header>
-                <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                    <ListBox ClipToBounds="False" ItemsSource="{Binding NotificationProvider.NotificationItems}" HorizontalAlignment="Stretch" MaxHeight="258"  >
-                        <ListBox.Style>
-                            <Style TargetType="{x:Type ListBox}" BasedOn="{StaticResource BlankListBox}">
-                                <Setter Property="VirtualizingPanel.ScrollUnit" Value="Pixel"></Setter>
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate TargetType="{x:Type ListBox}">
-                                            <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                                                <touch:TouchScrollViewer CanContentScroll="True" Padding="{TemplateBinding Padding}" Focusable="False"  
-                                                 Style="{StaticResource TouchVerticalScrollViewer}">
-                                                    <ItemsPresenter />
-                                                </touch:TouchScrollViewer>
-                                            </Border>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </ListBox.Style>
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <VirtualizingStackPanel IsVirtualizing="True" VirtualizationMode="Recycling" VirtualizingPanel.ScrollUnit="Pixel"  />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <Grid HorizontalAlignment="Stretch" Width="1220" Height="62">
-                                    <Border BorderThickness="1" Margin="-1 0 0 0" BorderBrush="{StaticResource TangoDividerBrush}">
-                                <Grid HorizontalAlignment="Stretch" >
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="56"/>
-                                                <ColumnDefinition Width="1*"/>
-                                                <ColumnDefinition Width="56"/>
-                                            </Grid.ColumnDefinitions> 
-                                    <touch:TouchIcon Margin="24 0 0 0" DockPanel.Dock="Left" Height="32" Grid.Column="0">
-                                        <touch:TouchIcon.Style>
-                                            <Style TargetType="touch:TouchIcon">
-                                                <Setter Property="Icon" Value="Information"></Setter>
-                                                    <Style.Triggers>
-                                                        <DataTrigger Binding="{Binding MessageType}" Value="Info">
-                                                            <Setter Property="Icon" Value="InformationOutline"></Setter>
-                                                            <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"/>
-                                                        </DataTrigger>
-                                                            <DataTrigger Binding="{Binding MessageType}" Value="Success">
-                                                                <Setter Property="Icon" Value="Check"/>
-                                                                <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"/>
-                                                            </DataTrigger>
-                                                            <DataTrigger Binding="{Binding MessageType}" Value="Warning">
-                                                            <Setter Property="Icon" Value="AlertCircleOutline"></Setter>
-                                                            <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"/>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding MessageType}" Value="Error">
-                                                            <Setter Property="Icon" Value="AlertCircleOutline"></Setter>
-                                                            <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"/>
-                                                        </DataTrigger>
-                                                        <DataTrigger Binding="{Binding MessageType}" Value="Critical">
-                                                            <Setter Property="Icon" Value="Alert"></Setter>
-                                                            <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"/>
-                                                        </DataTrigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                        </touch:TouchIcon.Style>
-                                    </touch:TouchIcon>
-                                    <StackPanel Margin="15 3 20 3" VerticalAlignment="Center" Grid.Column="1">
-                                                <TextBlock Text="{Binding Message}" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Foreground="Black" VerticalAlignment="Center" ></TextBlock>
-                                                <TextBlock Margin="0 5 0 0" Foreground="{StaticResource TangoDarkForegroundBrush}" Text="{Binding ExpandedMessage}" FontSize="{StaticResource TangoSmallFontSize}" TextWrapping="Wrap" VerticalAlignment="Center" />
-                                    </StackPanel>
-                                    <Grid Grid.Column="2" Width="40" HorizontalAlignment="Right" VerticalAlignment="Stretch" Visibility="{Binding CanClose,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                        <Grid Margin="0 0 20 0" HorizontalAlignment="Right" VerticalAlignment="Center" Width="14" Height="14">
-                                            <touch:TouchIcon Icon="Close" Foreground="Black" />
-                                        </Grid>
-                                        <touch:TouchButton Opacity="0" Background="Transparent" Style="{StaticResource TangoFlatButton}" Command="{Binding CloseCommand}" CommandParameter="{Binding}" Foreground="{StaticResource TangoPrimaryBackgroundBrush}" Padding="5" />
+            <Grid VerticalAlignment="Bottom" Grid.ColumnSpan="2" Margin="10 0 0 0">
+                <touch:TouchExpander x:Name="Notifications" Style="{StaticResource TouchRoundedExpander}"  IsTabStop="False" KeyboardNavigation.TabNavigation ="None" BorderThickness="0" IsExpanded="false" CornerRadius="20 20 0 0" >
+                    <touch:TouchExpander.Header>
+                        <DockPanel >
+                            <touch:TouchButton Margin="0 0 20 0" Content="Clear All" DockPanel.Dock="Right" Width="120"  Height="38"  HorizontalAlignment="Right" VerticalAlignment="Center" EnableDropShadow="False"  Background="Transparent" BorderThickness="1" CornerRadius="19"  BorderBrush="{StaticResource TangoPrimaryAccentBrush}" Foreground="{StaticResource TangoPrimaryAccentBrush}" Command="{Binding ClearAllNotificationsCommand}" Visibility="{Binding NotificationProvider.HasNotificationItems, Converter={StaticResource BooleanToVisibilityConverter}}" >
+
+                            </touch:TouchButton>
+                            <StackPanel DockPanel.Dock="Left" Orientation="Horizontal" VerticalAlignment="Center"  >
+                                <Image Source="../Images/Job Issues/Events.png" MaxWidth="33" Stretch="Fill" Height="36"/>
+                                <TextBlock VerticalAlignment="Center" Margin="20 4 0 0" FontWeight="SemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">Notifications</TextBlock>
+                                <TextBlock  Margin="10 0 0 0" VerticalAlignment="Center" FontWeight="Normal" FontSize="{StaticResource TangoComboBoxItemFontSize}" Visibility="{Binding NotificationProvider.HasNotificationItems, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                    <Run Text="(" ></Run>
+                                    <Run Text="{Binding NotificationProvider.NotificationItems, Mode=OneWay, Converter={StaticResource CollectionToCountConverter}}"></Run>
+                                    <Run Text=" new Events)" ></Run>
+                                </TextBlock>
+                            </StackPanel>
+                        </DockPanel>
+                    </touch:TouchExpander.Header>
+                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                        <ListBox ClipToBounds="False" ItemsSource="{Binding NotificationProvider.NotificationItems}" HorizontalAlignment="Stretch" MaxHeight="258"  >
+                            <ListBox.Style>
+                                <Style TargetType="{x:Type ListBox}" BasedOn="{StaticResource BlankListBox}">
+                                    <Setter Property="VirtualizingPanel.ScrollUnit" Value="Pixel"></Setter>
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate TargetType="{x:Type ListBox}">
+                                                <Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                                                    <touch:TouchScrollViewer CanContentScroll="True" Padding="{TemplateBinding Padding}" Focusable="False"  
+                                                     Style="{StaticResource TouchVerticalScrollViewer}">
+                                                        <ItemsPresenter />
+                                                    </touch:TouchScrollViewer>
+                                                </Border>
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </Style>
+                            </ListBox.Style>
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <VirtualizingStackPanel IsVirtualizing="True" VirtualizationMode="Recycling" VirtualizingPanel.ScrollUnit="Pixel"  />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <Grid HorizontalAlignment="Stretch" Width="1220" Height="62">
+                                        <Border BorderThickness="1" Margin="-1 0 0 0" BorderBrush="{StaticResource TangoDividerBrush}">
+                                            <Grid HorizontalAlignment="Stretch" >
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="56"/>
+                                                    <ColumnDefinition Width="1*"/>
+                                                    <ColumnDefinition Width="56"/>
+                                                </Grid.ColumnDefinitions>
+                                                <touch:TouchIcon Margin="24 0 0 0" DockPanel.Dock="Left" Height="32" Grid.Column="0">
+                                                    <touch:TouchIcon.Style>
+                                                        <Style TargetType="touch:TouchIcon">
+                                                            <Setter Property="Icon" Value="Information"></Setter>
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding MessageType}" Value="Info">
+                                                                    <Setter Property="Icon" Value="InformationOutline"></Setter>
+                                                                    <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"/>
+                                                                </DataTrigger>
+                                                                <DataTrigger Binding="{Binding MessageType}" Value="Success">
+                                                                    <Setter Property="Icon" Value="Check"/>
+                                                                    <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"/>
+                                                                </DataTrigger>
+                                                                <DataTrigger Binding="{Binding MessageType}" Value="Warning">
+                                                                    <Setter Property="Icon" Value="AlertCircleOutline"></Setter>
+                                                                    <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"/>
+                                                                </DataTrigger>
+                                                                <DataTrigger Binding="{Binding MessageType}" Value="Error">
+                                                                    <Setter Property="Icon" Value="AlertCircleOutline"></Setter>
+                                                                    <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"/>
+                                                                </DataTrigger>
+                                                                <DataTrigger Binding="{Binding MessageType}" Value="Critical">
+                                                                    <Setter Property="Icon" Value="Alert"></Setter>
+                                                                    <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"/>
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </touch:TouchIcon.Style>
+                                                </touch:TouchIcon>
+                                                <StackPanel Margin="15 3 20 3" VerticalAlignment="Center" Grid.Column="1">
+                                                    <TextBlock Text="{Binding Message}" TextTrimming="CharacterEllipsis" TextWrapping="Wrap" Foreground="Black" VerticalAlignment="Center" ></TextBlock>
+                                                    <TextBlock Margin="0 5 0 0" Foreground="{StaticResource TangoDarkForegroundBrush}" Text="{Binding ExpandedMessage}" FontSize="{StaticResource TangoSmallFontSize}" TextWrapping="Wrap" VerticalAlignment="Center" />
+                                                </StackPanel>
+                                                <Grid Grid.Column="2" Width="40" HorizontalAlignment="Right" VerticalAlignment="Stretch" Visibility="{Binding CanClose,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                                    <Grid Margin="0 0 20 0" HorizontalAlignment="Right" VerticalAlignment="Center" Width="14" Height="14">
+                                                        <touch:TouchIcon Icon="Close" Foreground="Black" />
+                                                    </Grid>
+                                                    <touch:TouchButton Opacity="0" Background="Transparent" Style="{StaticResource TangoFlatButton}" Command="{Binding CloseCommand}" CommandParameter="{Binding}" Foreground="{StaticResource TangoPrimaryBackgroundBrush}" Padding="5" />
+                                                </Grid>
+
+                                            </Grid>
+                                        </Border>
                                     </Grid>
-                                   
-                                </Grid>
-                                </Border>
-                                </Grid>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                    </ListBox>
-                </Grid>
-            </touch:TouchExpander>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ListBox>
+                    </Grid>
+                </touch:TouchExpander>
+            </Grid>
+        </Grid>
+        <Grid Visibility="{Binding IsDisplayJobOutline,Converter={StaticResource BooleanToVisibilityConverter}}" Background="{StaticResource TangoPrimaryBackgroundBrush}" Opacity="0.8"/>
+
+        <Grid Margin="0 -10 0 0" Visibility="{Binding IsDisplayJobOutline,Converter={StaticResource BooleanToVisibilityConverter}}">
+            <Grid>
+                <touch:TouchScrollViewer BorderThickness="0" Padding="10" Margin="0 0 0 100">
+                    <locaControls:JobOutlineControl IsHitTestVisible="False" BorderThickness="0" Margin="20" DataContext="{Binding JobOutlineTicket}" HorizontalAlignment="Left" />
+                </touch:TouchScrollViewer>
+            </Grid>
+
+            <touch:TouchButton Background="{StaticResource TangoPrimaryBackgroundBrush}" VerticalAlignment="Bottom" Margin="0 100 0 0" Command="{Binding HideJobOutlineCommand}" Style="{StaticResource TangoLinkButton}" Height="60" FontSize="{StaticResource TangoTitleFontSize}">
+                Hide Job Outline
+            </touch:TouchButton>
         </Grid>
     </Grid>
 </UserControl>
-- 
cgit v1.3.1