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

15 files changed, 55 insertions, 56 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
index fd0a63456..ba6c13e91 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
@@ -89,7 +89,7 @@
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
 
-                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="10" RadiusY="10" />
+                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="8" RadiusY="8" />
                 </Grid>
             </Border>
         </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml
index a0bc6c1d9..97aedcf89 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/RunningJobViewer.xaml
@@ -90,7 +90,7 @@
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
 
-                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="10" RadiusY="10" />
+                    <Rectangle Stroke="{StaticResource TangoGrayBrush}" StrokeThickness="1" StrokeDashArray="5 5 5 5" RadiusX="8" RadiusY="8" />
                 </Grid>
             </Border>
         </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view - blue.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view - blue.png
new file mode 100644
index 000000000..a37e0b555
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view - blue.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view.png
new file mode 100644
index 000000000..697ce228c
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/large-cards-view.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-blue.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-blue.png
new file mode 100644
index 000000000..cab937cef
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-blue.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-gray.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-gray.png
new file mode 100644
index 000000000..0ca2eed8c
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/pencil-gray.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/plus.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/plus.png
new file mode 100644
index 000000000..de965130e
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/plus.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view - blue.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view - blue.png
new file mode 100644
index 000000000..d0a97503e
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view - blue.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view.png
new file mode 100644
index 000000000..873b7513f
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/small-cards-view.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
index 8ed2ff80e..aedf09ce7 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
@@ -469,10 +469,23 @@
   <ItemGroup>
     <Resource Include="Images\Coats\thread.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\plus.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\pencil-blue.png" />
+    <Resource Include="Images\pencil-gray.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\large-cards-view - blue.png" />
+    <Resource Include="Images\large-cards-view.png" />
+    <Resource Include="Images\small-cards-view - blue.png" />
+    <Resource Include="Images\small-cards-view.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index c78af155c..2532aeef6 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -1062,7 +1062,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     {
                         FineTuneItems.Clear();
 
-                        foreach (var stop in Job.Segments.SelectMany(x => x.BrushStops).DistinctBy(x => x.Color))
+                        foreach (var stop in Job.Segments.SelectMany(x => x.BrushStops).Where(x => x.ColorSpace.Space == BL.Enumerations.ColorSpaces.RGB || x.ColorSpace.Space == BL.Enumerations.ColorSpaces.LAB).DistinctBy(x => x.Color))
                         {
                             FineTuneItem item = new FineTuneItem(_converter.Convert(stop));
                             item.BrushStops = Job.Segments.SelectMany(x => x.BrushStops).Where(x => x.Color == stop.Color).ToList();
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
index cf49bd024..3b92581bc 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
@@ -89,7 +89,7 @@
                             <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Completed</TextBlock>
                         </StackPanel>
 
-                        <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                        <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                                             <Run Text="{Binding RunningJobStatus.ProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"></Run><Run Text="/" /><Run Text="{Binding RunningJobStatus.TotalProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"/>
                                             <Run FontSize="16">m</Run>
                         </TextBlock>
@@ -109,7 +109,7 @@
                         <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Time Left</TextBlock>
                     </StackPanel>
 
-                    <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                    <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                         <Run Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=5}"></Run>
                         <Run FontSize="16" Text="{Binding RunningJobStatus.RemainingTime,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
                     </TextBlock>
@@ -201,7 +201,7 @@
                     </Canvas>
 
                     <Grid>
-                        <controls:RunningJobViewer Height="30" Width="600" DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" />
+                        <controls:RunningJobViewer Height="26" Width="600" DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" />
 
                         <TextBlock Margin="0 0 -50 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right">
                             <Run Text="x"></Run><Run Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
index ac2d5b3be..95508197d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobSummeryView.xaml
@@ -12,7 +12,7 @@
              mc:Ignorable="d" 
              d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:JobSummeryViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.JobSummeryViewVM}">
 
-    <Grid Background="{StaticResource TangoMidBackgroundBrush}">
+    <Grid Background="White">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="1*"/>
@@ -22,7 +22,7 @@
             <Border.Effect>
                 <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" />
             </Border.Effect>
-            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold" Text="Ready to Dye"></TextBlock>
+            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold" Text="Dye Job"></TextBlock>
         </Border>
 
         <Grid Grid.Row="1">
@@ -31,16 +31,15 @@
                     <Grid DockPanel.Dock="Bottom">
                         <StackPanel>
                             <Grid>
-                                <touch:TouchButton HorizontalAlignment="Left" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Command="{Binding EditCommand}" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" RippleBrush="{StaticResource TangoRippleDarkBrush}" Background="Transparent" EnableDropShadow="False" Height="80" Padding="0" Width="270" Foreground="{StaticResource TangoPrimaryAccentBrush}" CornerRadius="40" BlurRadius="20">
-                                    <StackPanel Orientation="Horizontal">
-                                        <fa:ImageAwesome Icon="Pencil" Width="24" Foreground="{StaticResource TangoPrimaryAccentBrush}" />
-                                        <TextBlock Margin="20 0 0 0" VerticalAlignment="Center">EDIT</TextBlock>
-                                    </StackPanel>
+                                <touch:TouchButton HorizontalContentAlignment="Stretch" HorizontalAlignment="Left" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Command="{Binding EditCommand}" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" RippleBrush="{StaticResource TangoRippleDarkBrush}" Background="Transparent" EnableDropShadow="False" Height="80" Padding="0" Width="270" Foreground="{StaticResource TangoPrimaryAccentBrush}" CornerRadius="40" BlurRadius="20">
+                                    <DockPanel>
+                                        <Image DockPanel.Dock="Left" Source="../Images/pencil-blue.png" Width="30" Height="23" VerticalAlignment="Center" Margin="40 0 0 5"></Image>
+                                        <TextBlock Margin="0 0 55 0" HorizontalAlignment="Center" VerticalAlignment="Center">EDIT</TextBlock>
+                                    </DockPanel>
                                 </touch:TouchButton>
                                 <touch:TouchButton IsEnabled="{Binding MachineProvider.MachineOperator.CanPrint}" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Margin="20 0 0 0" Height="80" Padding="0" Width="270" CornerRadius="40" BlurRadius="20" HorizontalAlignment="Right" DelayCommand="{Binding DyeCommand}" DelayCommandDuration="00:00:0.3">
                                     <StackPanel Orientation="Horizontal">
                                         <TextBlock VerticalAlignment="Center">DYE</TextBlock>
-                                        <touch:TouchIcon Margin="20 0 0 0" Icon="ChevronRight" Width="14" />
                                     </StackPanel>
                                 </touch:TouchButton>
                             </Grid>
@@ -69,7 +68,7 @@
                                             <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Length</TextBlock>
                                         </StackPanel>
 
-                                        <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                        <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                                             <Run Text="{Binding Job.LengthIncludingNumberOfUnits,Mode=OneWay,StringFormat=0,FallbackValue=0}"/>
                                             <Run FontSize="16">m</Run>
                                         </TextBlock>
@@ -83,7 +82,7 @@
                                             <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Time</TextBlock>
                                         </StackPanel>
 
-                                        <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                        <TextBlock FontWeight="Light" FontSize="{StaticResource TangoLargeFontSize}" Margin="0 10 0 0" HorizontalAlignment="Center">
                                         <Run Text="{Binding EstimatedDuration,Mode=OneWay,Converter={StaticResource TimeSpanToTwoDigitsTimeConverter},FallbackValue=5}"></Run>
                                         <Run FontSize="16" Text="{Binding EstimatedDuration,Mode=OneWay,Converter={StaticResource TimeSpanToLabelConverter},FallbackValue=min}"></Run>
                                         </TextBlock>
@@ -92,7 +91,7 @@
                             </UniformGrid>
                         </Grid>
 
-                        <controls:JobSummeryViewer Height="50" DataContext="{Binding Job}" VerticalAlignment="Center" Margin="20 0" Grid.Row="2" />
+                        <controls:JobSummeryViewer Height="40" DataContext="{Binding Job}" VerticalAlignment="Center" Margin="20 0" Grid.Row="2" />
                     </Grid>
                 </DockPanel>
             </Border>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index ec21ebade..9287203aa 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -107,7 +107,7 @@
         </DataTemplate>
 
         <DataTemplate x:Key="BrushStop_Template" DataType="{x:Type entities:BrushStop}">
-            <Grid Margin="50 20 140 20" RenderOptions.EdgeMode="Aliased">
+            <Grid Margin="50 20 140 20">
                 <StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <Border Width="48" Height="48" CornerRadius="5" BorderThickness="1" BorderBrush="{StaticResource TangoGrayBrush}">
@@ -548,12 +548,21 @@
                                                 <Border x:Name="borderDockFloat" Height="80">
                                                     <DockPanel x:Name="dockEdit" LastChildFill="False" Style="{StaticResource Level2ContainerExtraMargin}" Height="40" Width="640">
                                                         <StackPanel DockPanel.Dock="Left" Orientation="Horizontal">
-                                                            <touch:TouchToggleIconButton x:Name="toggle_small_list" IsChecked="{Binding ElementName=toggle_large_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right" Icon="ListSolid" CheckedIcon="ListSolid" Padding="8" CornerRadius="20" />
-                                                            <Rectangle HorizontalAlignment="Left" Stroke="{StaticResource TangoDividerBrush}" Margin="10 8" />
-                                                            <touch:TouchToggleIconButton x:Name="toggle_large_list" IsChecked="{Binding ElementName=toggle_small_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right" Icon="ThListSolid" CheckedIcon="ThListSolid" Padding="8" CornerRadius="20" />
+                                                            <touch:TouchToggleImageButton x:Name="toggle_small_list" UncheckedImage="../Images/small-cards-view.png"  CheckedImage="../Images/small-cards-view - blue.png" 
+                                                                                     IsChecked="{Binding ElementName=toggle_large_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right" 
+                                                                                      Padding="8" CornerRadius="30" Width="44" />
+                                                           <Rectangle HorizontalAlignment="Left" Stroke="{StaticResource TangoDividerBrush}" Margin="10 8" />
+                                                            <touch:TouchToggleImageButton x:Name="toggle_large_list" UncheckedImage="../Images/large-cards-view.png"  CheckedImage="../Images/large-cards-view - blue.png" 
+                                                                                     IsChecked="{Binding ElementName=toggle_small_list,Path=IsChecked,Mode=OneWay,Converter={StaticResource BooleanInverseConverter}}" DockPanel.Dock="Right"
+                                                                                      Padding="8" CornerRadius="30" Width="44" />
                                                         </StackPanel>
-
-                                                        <touch:TouchToggleIconButton x:Name="toggleEdit" DockPanel.Dock="Right" Icon="Pencil" CheckedIcon="Pencil" Padding="8" CornerRadius="20" />
+                                                        <touch:TouchToggleImageButton x:Name="toggleEdit" UncheckedImage="../Images/pencil-gray.png" 
+                                                                                      CheckedImage="../Images/pencil-blue.png" 
+                                                                                      DockPanel.Dock="Right" 
+                                                                                      IsChecked="{Binding IsSelected}" 
+                                                                                      Padding="8" CornerRadius="30" Width="40" Height="40">
+                                                            </touch:TouchToggleImageButton>
+                                                        <!--<touch:TouchToggleIconButton x:Name="toggleEdit" DockPanel.Dock="Right" Icon="Pencil" CheckedIcon="Pencil" Padding="8" CornerRadius="20" />-->
                                                     </DockPanel>
                                                 </Border>
 
@@ -562,8 +571,8 @@
                                                 <StackPanel HorizontalAlignment="Right" Style="{StaticResource Level2Container}" Orientation="Horizontal">
                                                     <touch:TouchButton Command="{Binding AddSolidSegmentCommand}" FontWeight="Normal" RippleBrush="{StaticResource TangoRippleDarkBrush}" FontSize="{StaticResource TangoDefaultFontSize}" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="170" CornerRadius="20" Padding="0 10" Background="Transparent" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}">
                                                         <StackPanel Orientation="Horizontal">
-                                                            <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="16" Height="16" />
-                                                            <TextBlock Margin="10 0 0 0">SOLID SEGMENT</TextBlock>
+                                                            <Image VerticalAlignment="Center" Margin="0 1 0 0" Source="../Images/plus.png" Width="12"/>
+                                                            <TextBlock Margin="10 2 0 0">SOLID SEGMENT</TextBlock>
                                                         </StackPanel>
                                                     </touch:TouchButton>
                                                     <touch:TouchButton Command="{Binding AddGradientSegmentCommand}" FontWeight="Normal" RippleBrush="{StaticResource TangoRippleDarkBrush}" FontSize="{StaticResource TangoDefaultFontSize}" Margin="30 0 0 0" EnableDropShadow="False" Foreground="{StaticResource TangoPrimaryAccentBrush}" Padding="0 10" Width="200" CornerRadius="20" Background="Transparent" BorderThickness="2">
@@ -575,8 +584,8 @@
                                                         </touch:TouchButton.BorderBrush>
 
                                                         <StackPanel Orientation="Horizontal">
-                                                            <fa:ImageAwesome Icon="Plus" Foreground="{StaticResource TangoPrimaryAccentBrush}" Width="16" Height="16" />
-                                                            <TextBlock Margin="10 0 0 0">GRADIENT SEGMENT</TextBlock>
+                                                            <Image VerticalAlignment="Center" Margin="0 1 0 0" Source="../Images/plus.png" Width="12"/>
+                                                            <TextBlock Margin="10 2 0 0">GRADIENT SEGMENT</TextBlock>
                                                         </StackPanel>
                                                     </touch:TouchButton>
                                                 </StackPanel>
@@ -648,7 +657,7 @@
 
                                                 <StackPanel Style="{StaticResource Level2ContainerExtraMargin}">
                                                     <Grid>
-                                                        <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" />
+                                                        <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" Height="40"/>
                                                     </Grid>
 
                                                     <DockPanel Margin="0 30 0 0" LastChildFill="False">
@@ -694,28 +703,6 @@
                                         <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Additional Tools</TextBlock>
                                     </StackPanel>
 
-                                    <!--<Border Style="{StaticResource TangoTouchBorder}" Margin="0 12 0 0" Padding="0 0 0 40">
-                                <StackPanel>
-                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  Style="{StaticResource Level1Container}">
-                                        <Image Source="../Images/JobView/additional-tools.png" Width="39" />
-                                        <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Additional Tools</TextBlock>
-                                    </StackPanel>
-
-                                    <StackPanel Style="{StaticResource Level2Container}" HorizontalAlignment="Left">
-
-                                        <DockPanel LastChildFill="False">
-                                            <TextBlock Text="Make a sample dye" VerticalAlignment="Center"></TextBlock>
-                                            <touch:TouchToggleSlider x:Name="toggle_sample_dye" DockPanel.Dock="Right" Width="75" Style="{StaticResource TouchToggleButtonCheck}" Margin="30 0 0 0" Height="38" HorizontalAlignment="Left" />
-                                        </DockPanel>
-
-                                        <DockPanel Margin="0 25 0 0" LastChildFill="False">
-                                            <TextBlock Text="Run color fine tuning" VerticalAlignment="Center"></TextBlock>
-                                            <touch:TouchToggleSlider DockPanel.Dock="Right" Width="75" Style="{StaticResource TouchToggleButtonCheck}" Margin="30 0 0 0" Height="38" HorizontalAlignment="Left" />
-                                        </DockPanel>
-                                    </StackPanel>
-                                </StackPanel>
-                            </Border>-->
-
                                     <touch:TouchVirtualizedContentControl>
                                         <touch:TouchExpander x:Name="expander_sample_dye" Margin="0 0 0 0" Padding="20 15">
                                             <touch:TouchExpander.Header>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
index 5b9c234f0..c615583bc 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml
@@ -292,9 +292,9 @@
                                 <touch:LightTouchDataGridColumn.Header>
                                     <Image Source="../Images/warning.png" Width="24" />
                                 </touch:LightTouchDataGridColumn.Header>
-                                <touch:LightTouchDataGridColumn.CellTemplate>
+                                <touch:LightTouchDataGridColumn.CellTemplate >
                                     <DataTemplate>
-                                        <touch:TouchIcon Width="26">
+                                        <touch:TouchIcon Width="26" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" >
                                             <touch:TouchIcon.Style>
                                                 <Style TargetType="touch:TouchIcon">
                                                     <Setter Property="Icon" Value="Check"></Setter>
@@ -311,17 +311,17 @@
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
-                            <touch:LightTouchDataGridColumn Width="100" Header="Status" SortMember="JobStatus">
+                            <touch:LightTouchDataGridColumn Width="100" Header="Status" SortMember="JobStatus" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter},IsAsync=True}"></controls:FastTextBlock>
+                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter},IsAsync=True}" HorizontalAlignment="Left" VerticalAlignment="Center"></controls:FastTextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>
                             <touch:LightTouchDataGridColumn Width="1*" Header="Name" SortMember="Name" HorizontalContentAlignment="Left">
                                 <touch:LightTouchDataGridColumn.CellTemplate>
                                     <DataTemplate>
-                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding Name,IsAsync=True}"></controls:FastTextBlock>
+                                        <controls:FastTextBlock IsHitTestVisible="False" Text="{Binding Name,IsAsync=True}" HorizontalAlignment="Left" VerticalAlignment="Center"></controls:FastTextBlock>
                                     </DataTemplate>
                                 </touch:LightTouchDataGridColumn.CellTemplate>
                             </touch:LightTouchDataGridColumn>