GUI changes.

3 files changed, 92 insertions, 89 deletions

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 a2d0d5930..aa8f67d4d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutEurekaView.xaml
@@ -205,7 +205,7 @@
         </Grid>
 
         <Grid Background="Gainsboro" Grid.Column="2">
-            <Viewbox>
+            <Viewbox Stretch="Fill" Width="1246" Height="1400">
                 <local:MachineStatusView />
             </Viewbox>
         </Grid>
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 5c96fecb1..1e528765e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml
@@ -150,8 +150,11 @@
                                     </CombinedGeometry.Geometry2>
                             </CombinedGeometry>
                         </Path.Data>
-                    </Path>
-                    <Path  Stroke="Black" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}"/>
+                           
+                        </Path>
+                    <Path  Stroke="Black" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}">
+                           
+                        </Path>
                 </Grid>
                     <UniformGrid Rows="4" Columns="1" Margin="0 15 0 15" HorizontalAlignment="Center">
                         <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle>
@@ -248,9 +251,9 @@
         </DataTemplate>
 
     </UserControl.Resources>
-    <Grid Width="1246" Height="1400">
+    <Grid Width="960" Height="1080">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="32"></ColumnDefinition>
+            <ColumnDefinition Width="28"></ColumnDefinition>
             <ColumnDefinition Width="1*"></ColumnDefinition>
         </Grid.ColumnDefinitions>
         <Border>
@@ -258,7 +261,6 @@
                 <LinearGradientBrush StartPoint="0,0" EndPoint="1,0" >
                     <GradientStop Color="Gainsboro" Offset="0" />
                     <GradientStop Color="{StaticResource TangoMidBackgroundColor}" Offset="1.0" />
-
                 </LinearGradientBrush>
             </Border.Background>
         </Border>
@@ -268,10 +270,10 @@
             <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="20" Height="40" Width="324" ThumbWidth="160" 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">
+
+                <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">
@@ -302,9 +304,9 @@
                     </Grid>
                 </Grid>
                 </Canvas>
-            <Grid x:Name="JobStatus" Margin="32 50 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityConverter}}">
+            <Grid x:Name="JobStatus" Margin="32 18 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityConverter}}">
                 <Grid.RowDefinitions>
-                <RowDefinition Height="95"></RowDefinition>
+                <RowDefinition Height="78"></RowDefinition>
                 <RowDefinition Height="Auto"></RowDefinition>
                 <RowDefinition Height="Auto"></RowDefinition>
                 <RowDefinition Height="Auto"></RowDefinition>
@@ -324,7 +326,7 @@
                     <Border Height="2" Background="{StaticResource TangoLightBorderBrush}"  VerticalAlignment="Bottom"  Margin="0 2 0 0" CornerRadius="2"></Border>
                 </Grid>
 
-                <DockPanel Grid.Row="1" Margin="0 25 0 0">
+                <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>
@@ -332,7 +334,7 @@
                             </StackPanel>
                         </StackPanel>
 
-                        <UniformGrid DockPanel.Dock="Left" Columns="1" Rows="5" HorizontalAlignment="Left" Margin="0 0 0 0" Height="420" VerticalAlignment="Top">
+                        <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">
@@ -585,14 +587,14 @@
                             </StackPanel>
                         </Grid>
             </DockPanel>
-                <StackPanel x:Name="Job_Progress" Grid.Row="2" Margin="0 25 0 0" Orientation="Vertical">
+                <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 25 0 0">
-                            <locaControls:RunningJobViewerEureka Height="26"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}"  />
+                    <Grid Margin="0 10 0 0">
+                            <locaControls:RunningJobViewerEureka Height="14"  DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}"  />
                            
                            
                             <!--<TextBlock Margin="0 0 -50 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right">
@@ -604,62 +606,62 @@
                                            MaximumValue ="{Binding RunningJobStatus.TotalProgressMinusSettingUp}"
                             Value ="{Binding RunningJobStatus.ProgressMinusSettingUp}"/>
 
-                        <UniformGrid DockPanel.Dock="Bottom" Columns="4" Rows="1" HorizontalAlignment="Left" Margin="0 35 0 0" Height="Auto" VerticalAlignment="Top" Width="1200">
-                        <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">
-                                                <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
-                                                <Binding Path="Job.Spools" Mode="OneWay"/>
-                                            </MultiBinding>
-                                        </TextBlock.Text>
-                                    </TextBlock>
+                        <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">
+                                                    <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
+                                                    <Binding Path="Job.Spools" Mode="OneWay"/>
+                                                </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>
-                                    <TextBlock   FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}">
-                                        <TextBlock.Text>
-                                            <MultiBinding Converter="{StaticResource LengthToWeightConverter}" StringFormat="0.##" TargetNullValue='-' FallbackValue='-' Mode="OneWay">
-                                                <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
-                                                <Binding Path="Job.GramPerLength" Mode="OneWay"/>
-                                                <Binding Path="Job.Spools" Mode="OneWay"/>
-                                            </MultiBinding>
-                                        </TextBlock.Text>
-                                    </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">
+                                                    <Binding Path="RunningJobStatus.ProgressMinusSettingUp" Mode="OneWay"/>
+                                                    <Binding Path="Job.GramPerLength" Mode="OneWay"/>
+                                                    <Binding Path="Job.Spools" Mode="OneWay"/>
+                                                </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>
-                                    <TextBlock Text="{Binding RunningJobStatus.CurrentUnit,TargetNullValue='-', FallbackValue='-'}" FontWeight="DemiBold" FontSize="{StaticResource TangoComboBoxItemFontSize}"></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>
+                            <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 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>-->
+                                                <!--<Run FontSize="16">m</Run>-->
                                     </TextBlock>
                                 </StackPanel>
-                        </StackPanel>
-                    </UniformGrid>
+                            </StackPanel>
+                        </UniformGrid>
 
                 </StackPanel>
-                <Grid Grid.Row="3" Margin="0 30 0 0" >
+                <Grid Grid.Row="3" Margin="0 15 0 0" >
 
                     <Rectangle Fill="{StaticResource TangoLightBorderBrush}" Height="2" VerticalAlignment="Top"></Rectangle>
-                    <Grid Margin="0 40 0 0">
+                    <Grid Margin="0 30 0 0">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="1*"/>
                             <ColumnDefinition Width="2*"/>
@@ -669,7 +671,7 @@
                                 <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 35 0 0" Rows="1" Columns="3" Height="Auto" MinWidth="180" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                <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"/>
@@ -688,7 +690,7 @@
                                     </StackPanel>
                                 </UniformGrid>
                                 <Grid Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <ContentControl x:Name="leftBrushValues" HorizontalAlignment="Left" Content="{Binding CurrentBrushStop}" Width="Auto"  Height="Auto"  Margin="0 30 0 0">
+                                    <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">
@@ -720,7 +722,7 @@
                                 <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 35 0 0" Rows="1" Columns="7" Height="Auto" Width="435" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                <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>
@@ -757,7 +759,7 @@
                                         <TextBlock Margin="0 10 0 0 " Text="0%" FontSize="{StaticResource TangoSmallFontSize}" HorizontalAlignment="Center"/>
                                     </StackPanel>
                                 </UniformGrid>
-                                <UniformGrid Columns="7" Rows="1" Margin="0 30 0 0" Width="440" HorizontalAlignment="Left" Visibility="{Binding IsDyeingProcess,Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <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>
@@ -800,9 +802,9 @@
                 </Grid>
             </Grid>
 
-                <Grid x:Name="Overview" Margin="32 50 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                <Grid x:Name="Overview" Margin="32 18 60 0" Grid.Row="1" Visibility="{Binding IsJobStatusViewEnable, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="96"></RowDefinition>
+                        <RowDefinition Height="74"></RowDefinition>
                         <RowDefinition Height="Auto"></RowDefinition>
                         <RowDefinition Height="Auto"></RowDefinition>
                         <RowDefinition Height="Auto"></RowDefinition>
@@ -861,10 +863,10 @@
                                 <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="20 22 20 0">
+                            <UniformGrid Columns="5" Rows="1" Height="120" Margin="40 11 40 0">
                                 <StackPanel Orientation="Vertical">
                                 <Grid>
-                                    <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="10" Maximum="10" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
+                                    <touch:TouchArcProgress Foreground="Green" RingThickness="8" Value="10" Maximum="10" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
                                     <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="Bold" Foreground="Green">10</TextBlock>
                                     <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 10" FontSize="{StaticResource TangoComboBoxItemFontSize}" >Bar</TextBlock>
 
@@ -874,7 +876,7 @@
                                 
                                 <StackPanel Orientation="Vertical">
                                 <Grid>
-                                    <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="200" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
+                                    <touch:TouchArcProgress Foreground="Green" RingThickness="8" Value="200" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
                                     <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">200</TextBlock>
                                     <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C" ></TextBlock>
                                 </Grid> 
@@ -882,7 +884,7 @@
                                 </StackPanel>
                                 <StackPanel Orientation="Vertical">
                                     <Grid>
-                                    <touch:TouchArcProgress Foreground="Red" RingThickness="10" Value="80" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
+                                    <touch:TouchArcProgress Foreground="Red" RingThickness="8" Value="80" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
                                     <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Black">80/200</TextBlock>
                                     <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C"></TextBlock>
 
@@ -891,7 +893,7 @@
                                 </StackPanel>
                                 <StackPanel Orientation="Vertical">
                                     <Grid>
-                                    <touch:TouchArcProgress Foreground="Green" RingThickness="10" Value="200" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
+                                    <touch:TouchArcProgress Foreground="Green" RingThickness="8" Value="200" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
                                     <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Green">200</TextBlock>
                                     <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C"></TextBlock>
 
@@ -900,7 +902,7 @@
                                 </StackPanel>
                                 <StackPanel Orientation="Vertical">
                                     <Grid>
-                                    <touch:TouchArcProgress Foreground="red" RingThickness="10" Value="218" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
+                                    <touch:TouchArcProgress Foreground="red" RingThickness="8" Value="218" Maximum="200" Minimum="0" Width="100" Height="100"></touch:TouchArcProgress>
                                     <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Foreground="Red">218/200</TextBlock>
                                     <TextBlock VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="0 0 0 20" FontSize="{StaticResource TangoComboBoxItemFontSize}" FontWeight="SemiBold" Text="&#186;C"></TextBlock>
 
@@ -908,7 +910,7 @@
                                     <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">Dyeing Head</TextBlock>
                                 </StackPanel>
                             </UniformGrid>
-                            <Grid  Margin="0 28 0 0">
+                            <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">
@@ -930,7 +932,7 @@
                                                 <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">Winder</TextBlock>
+                                        <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}">
@@ -951,7 +953,7 @@
                                                 <Image  Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
                                             </UniformGrid>
                                         </Border>
-                                        <TextBlock HorizontalAlignment="Center" Margin="14">Dancer</TextBlock>
+                                        <TextBlock HorizontalAlignment="Center" Margin="14 18 14 14" FontWeight="Thin">Dancer</TextBlock>
                                     </StackPanel>
 
 
@@ -974,7 +976,7 @@
                                                 <Image Stretch="Fill" Width="24"  Height="24" Source="../Images/Overview Icons/Normal.png"  HorizontalAlignment="Center" ></Image>
                                             </UniformGrid>
                                         </Border>
-                                        <TextBlock HorizontalAlignment="Center" Margin="0 16 0 0">BTSR</TextBlock>
+                                        <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}">
@@ -987,13 +989,13 @@
                                                 <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">Feeder</TextBlock>
+                                        <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 20 0 0" Height="220">
+                    <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" >
@@ -1002,7 +1004,7 @@
                                         <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="-20 0 0 0"/>
+                                        <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="-15 0 0 0"/>
                                     <ContentControl Margin="20 0 0 0" ContentTemplate="{StaticResource WasteBox}" Content="{Binding}" IsTabStop="False"/>
                                     </StackPanel>
 
@@ -1016,19 +1018,19 @@
                                         <ItemsControl ItemsSource="{Binding MidTankLevels}" ItemTemplate="{StaticResource LiquidBox}">
                                             <ItemsControl.ItemsPanel>
                                                 <ItemsPanelTemplate>
-                                                    <UniformGrid Rows="1" IsItemsHost="True" Width="800"></UniformGrid>
+                                                    <UniformGrid Rows="1" IsItemsHost="True" Width="550"></UniformGrid>
                                                 </ItemsPanelTemplate>
                                             </ItemsControl.ItemsPanel>
                                         </ItemsControl>
 
-                                        <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="20 0 0 0"/>
-                                        <ContentControl Margin="55 0 0 0" ContentTemplate="{StaticResource LubBox}" Content="{Binding}" IsTabStop="False"/>
+                                        <Rectangle Height="88" Width="2" Fill="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="12 0 0 0"/>
+                                        <ContentControl Margin="45 0 0 0" ContentTemplate="{StaticResource LubBox}" Content="{Binding}" IsTabStop="False"/>
                                     </StackPanel>
                                 </StackPanel>
                         </DockPanel>
                        
                         </StackPanel>
-                         <Border VerticalAlignment="Bottom" Height="2" Background="{StaticResource TangoLightBorderBrush}"   Margin="0 40 0 0" CornerRadius="2"></Border>
+                         <Border VerticalAlignment="Bottom" Height="2" Background="{StaticResource TangoLightBorderBrush}"   Margin="0 0 0 0" CornerRadius="2"></Border>
                     </Grid>
                 </Grid>
             </Grid>
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchToggleSlider.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchToggleSlider.xaml
index adb76ebd3..66328ea2d 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchToggleSlider.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchToggleSlider.xaml
@@ -178,14 +178,15 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type local:TouchToggleSlider}">
                     <Border>
+                        <Border.Effect>
+                                    <DropShadowEffect ShadowDepth="0" BlurRadius="1" Opacity="1"/>
+                        </Border.Effect>
+
                         <components:Ripple CornerRadius="{TemplateBinding CornerRadius}" Centered="True" RippleBrush="{StaticResource TangoRippleDarkBrush}">
                             <Border
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">
-                                <Border.Effect>
-                                    <DropShadowEffect ShadowDepth="0" BlurRadius="10" Opacity="0.5"/>
-                                </Border.Effect>
-
+                                
                                 <Border.Style>
                                     <Style TargetType="Border">
                                         <Setter Property="Background" Value="{Binding RelativeSource={RelativeSource AncestorType=local:TouchToggleSlider},Path=UncheckedBackground}"></Setter>