Working on PPC.

7 files changed, 23 insertions, 373 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml
index 621b6a6d2..a2cba71b1 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/App.xaml
@@ -7,6 +7,8 @@
     <Application.Resources>
 		<ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                
+                <!--Touch-->
                 <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Resources/Colors.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Resources/Fonts.xaml"/>
                 <ResourceDictionary Source="pack://application:,,,/Tango.PPC.Common;component/Resources/Fonts.xaml"/>
@@ -14,153 +16,9 @@
                 <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Styles/TouchButton.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/Tango.Touch;component/Styles/TouchIconButton.xaml" />
 
-                <!--Styles-->
-				<ResourceDictionary>
-					<Style TargetType="{x:Type ListBoxItem}" x:Key="basicListBoxItem">
-						<Setter Property="Background" Value="Transparent"/>
-						<Setter Property="BorderThickness" Value="0"></Setter>
-						<Setter Property="FocusVisualStyle" Value="{x:Null}"></Setter>
-						<Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-						<Setter Property="Padding" Value="0"/>
-						<Setter Property="Template">
-							<Setter.Value>
-								<ControlTemplate TargetType="{x:Type ListBoxItem}">
-									<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" Background="{TemplateBinding Background}" Padding="0" SnapsToDevicePixels="true">
-										<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-									</Border>
-									<ControlTemplate.Triggers>
-										<Trigger Property="IsSelected" Value="true">
-											<Setter Property="Background" TargetName="Bd" Value="Transparent"/>
-										</Trigger>
-										<MultiTrigger>
-											<MultiTrigger.Conditions>
-												<Condition Property="IsSelected" Value="true"/>
-												<Condition Property="Selector.IsSelectionActive" Value="false"/>
-											</MultiTrigger.Conditions>
-											<Setter Property="Background" TargetName="Bd" Value="Transparent"/>
-										</MultiTrigger>
-										<Trigger Property="IsEnabled" Value="false">
-											<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-										</Trigger>
-									</ControlTemplate.Triggers>
-								</ControlTemplate>
-							</Setter.Value>
-						</Setter>
-					</Style>
 
-					<Style x:Key="emptyToggleButton" TargetType="ToggleButton">
-						<Setter Property="Background" Value="Transparent" />
-						<Setter Property="Template">
-							<Setter.Value>
-								<ControlTemplate TargetType="ToggleButton">
-									<Grid Background="{TemplateBinding Background}">
-										<ContentPresenter />
-									</Grid>
-								</ControlTemplate>
-							</Setter.Value>
-						</Setter>
-					</Style>
-
-					<Style x:Key="emptyButton" TargetType="Button">
-						<Setter Property="Background" Value="Transparent" />
-						<Setter Property="Template">
-							<Setter.Value>
-								<ControlTemplate TargetType="Button">
-									<Grid Background="{TemplateBinding Background}">
-										<ContentPresenter />
-									</Grid>
-								</ControlTemplate>
-							</Setter.Value>
-						</Setter>
-					</Style>
-
-					<!--Drag & Drop-->
-					<Style x:Key="draggableGrid" TargetType="Grid">
-						<Setter Property="RenderTransform">
-							<Setter.Value>
-								<ScaleTransform ScaleX="1" ScaleY="1"></ScaleTransform>
-							</Setter.Value>
-						</Setter>
-						<Setter Property="RenderTransformOrigin" Value="0.5,0.5"></Setter>
-						<Setter Property="Background" Value="Transparent"></Setter>
-						<Setter Property="dragAndDrop:DragAndDropService.Draggable" Value="True"></Setter>
-						<Setter Property="dragAndDrop:DragAndDropService.DraggingSurface" Value="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}"></Setter>
-					</Style>
-
-					<Style x:Key="droppableGrid" TargetType="Grid">
-						<Setter Property="RenderTransform">
-							<Setter.Value>
-								<ScaleTransform ScaleX="1" ScaleY="1"></ScaleTransform>
-							</Setter.Value>
-						</Setter>
-						<Setter Property="RenderTransformOrigin" Value="0.5,0.5"></Setter>
-						<Setter Property="Background" Value="Transparent"></Setter>
-						<Setter Property="dragAndDrop:DragAndDropService.Droppable" Value="True"></Setter>
-						<Setter Property="dragAndDrop:DragAndDropService.DraggingSurface" Value="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}"></Setter>
-						<Style.Triggers>
-							<Trigger Property="dragAndDrop:DragAndDropService.IsDraggableOver" Value="True">
-								<Setter Property="Opacity" Value="0.5"></Setter>
-								<Trigger.EnterActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimation To="0.95" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleX"></DoubleAnimation>
-											<DoubleAnimation To="0.95" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleY"></DoubleAnimation>
-										</Storyboard>
-									</BeginStoryboard>
-								</Trigger.EnterActions>
-								<Trigger.ExitActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimation To="1" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleX"></DoubleAnimation>
-											<DoubleAnimation To="1" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleY"></DoubleAnimation>
-										</Storyboard>
-									</BeginStoryboard>
-								</Trigger.ExitActions>
-							</Trigger>
-						</Style.Triggers>
-					</Style>
-
-					<Style x:Key="draggableDroppableGrid" TargetType="Grid">
-						<Setter Property="RenderTransform">
-							<Setter.Value>
-								<ScaleTransform ScaleX="1" ScaleY="1"></ScaleTransform>
-							</Setter.Value>
-						</Setter>
-						<Setter Property="RenderTransformOrigin" Value="0.5,0.5"></Setter>
-						<Setter Property="Background" Value="Transparent"></Setter>
-						<Setter Property="dragAndDrop:DragAndDropService.Draggable" Value="True"></Setter>
-						<Setter Property="dragAndDrop:DragAndDropService.Droppable" Value="True"></Setter>
-						<Setter Property="dragAndDrop:DragAndDropService.DraggingSurface" Value="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}"></Setter>
-						<Style.Triggers>
-							<Trigger Property="dragAndDrop:DragAndDropService.IsDraggableOver" Value="True">
-								<Setter Property="Opacity" Value="0.5"></Setter>
-								<Trigger.EnterActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimation To="0.95" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleX"></DoubleAnimation>
-											<DoubleAnimation To="0.95" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleY"></DoubleAnimation>
-										</Storyboard>
-									</BeginStoryboard>
-								</Trigger.EnterActions>
-								<Trigger.ExitActions>
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimation To="1" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleX"></DoubleAnimation>
-											<DoubleAnimation To="1" Duration="00:00:0.2" Storyboard.TargetProperty="RenderTransform.ScaleY"></DoubleAnimation>
-										</Storyboard>
-									</BeginStoryboard>
-								</Trigger.ExitActions>
-							</Trigger>
-						</Style.Triggers>
-					</Style>
-					<!--Drag & Drop-->
-
-					<!--Extensions-->
-
-				</ResourceDictionary>
-
-				<ResourceDictionary Source="Resources/Colors.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="Resources/MaterialOverride.xaml"></ResourceDictionary>
+                <!--Local-->
+                <ResourceDictionary Source="Resources/Colors.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
 		</ResourceDictionary>
     </Application.Resources>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml
index a62e31325..2465abc3d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/MainWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:Tango.PPC.UI"
 		xmlns:views="clr-namespace:Tango.PPC.UI.Views"
         mc:Ignorable="d"
-        Title="MainWindow" Height="1000" Stylus.IsTapFeedbackEnabled="False" Stylus.IsPressAndHoldEnabled="False" Stylus.IsTouchFeedbackEnabled="False"  Width="625" WindowStyle="None" ResizeMode="NoResize" FontFamily="{StaticResource Flexo}">
+        Title="MainWindow" Height="1000" Stylus.IsTapFeedbackEnabled="False" Stylus.IsPressAndHoldEnabled="False" Stylus.IsTouchFeedbackEnabled="False"  Width="625" WindowStyle="None" ResizeMode="NoResize" FontFamily="{StaticResource TangoFlexoFontFamily}">
     <Grid>
 		<Viewbox Stretch="Fill">
 			<Grid Height="1280" Width="800">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml
index 431533fcb..4bbd08a06 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/Colors.xaml
@@ -2,13 +2,4 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Tango.PPC.UI.Resources">
 
-
-	<Color x:Key="AccentColor">#2F65EE</Color>
-	<SolidColorBrush x:Key="AccentColorBrush" Color="{StaticResource AccentColor}"></SolidColorBrush>
-
-	<Color x:Key="WhiteColor">#FFFFFF</Color>
-	<SolidColorBrush x:Key="WhiteColorBrush" Color="{StaticResource WhiteColor}"></SolidColorBrush>
-
-	<Color x:Key="BorderColor">#C8CBD4</Color>
-	<SolidColorBrush x:Key="BorderColorBrush" Color="{StaticResource BorderColor}"></SolidColorBrush>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/MaterialOverride.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/MaterialOverride.xaml
deleted file mode 100644
index 49fb3e837..000000000
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Resources/MaterialOverride.xaml
+++ /dev/null
@@ -1,185 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-					xmlns:wpf="clr-namespace:MaterialDesignThemes.Wpf;assembly=MaterialDesignThemes.Wpf"
-                    xmlns:converters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
-                    xmlns:local="clr-namespace:Tango.PPC.UI.Resources">
-
-
-	<Style TargetType="ListBox" BasedOn="{StaticResource {x:Type ListBox}}">
-		<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="False"></Setter>
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled"></Setter>
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalOnly"></Setter>
-		<Setter Property="VirtualizingStackPanel.ScrollUnit" Value="Pixel"></Setter>
-		<Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-	</Style>
-	
-	<!--ListBoxItem--><!--
-	<Style TargetType="{x:Type ListBoxItem}">
-		<Setter Property="Background" Value="Transparent"/>
-		<Setter Property="BorderThickness" Value="0"/>
-		<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="False"></Setter>
-		<Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-		<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-		<Setter Property="Padding" Value="8"/>
-		<Setter Property="SnapsToDevicePixels" Value="True"/>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ListBoxItem}">
-					<Border Background="White"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-							CornerRadius="5"
-                            Margin="2"
-                            ClipToBounds="{TemplateBinding ClipToBounds}">
-						<Border.Effect>
-							<DropShadowEffect ShadowDepth="0" BlurRadius="8" Color="Silver" />
-						</Border.Effect>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup Name="CommonStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0:0:0.3" To="Normal">
-										<VisualTransition.GeneratedEasingFunction>
-											<CircleEase EasingMode="EaseOut"/>
-										</VisualTransition.GeneratedEasingFunction>
-									</VisualTransition>
-								</VisualStateGroup.Transitions>
-								<VisualState Name="Normal"/>
-								--><!--<VisualState Name="MouseOver">
-                                    <Storyboard>
-                                        <DoubleAnimation Storyboard.TargetName="MouseOverBorder" Storyboard.TargetProperty="Opacity"
-                                                             To="0.1" Duration="0"/>
-                                    </Storyboard>
-                                </VisualState>--><!--
-								<VisualState Name="Disabled"/>
-							</VisualStateGroup>
-							<VisualStateGroup Name="SelectionStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0:0:0.6"/>
-								</VisualStateGroup.Transitions>
-								<VisualState Name="Selected">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="SelectedBorder"
-                                                         Storyboard.TargetProperty="Opacity"
-                                                         To="0.18" Duration="0"/>
-									</Storyboard>
-								</VisualState>
-								<VisualState Name="Unselected"/>
-								<VisualState Name="SelectedUnfocused">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="SelectedBorder"
-                                                         Storyboard.TargetProperty="Opacity"
-                                                         To="0.03" Duration="0"/>
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-						<Grid>
-							<Border x:Name="MouseOverBorder"
-                                    Opacity="0" CornerRadius="5"
-                                    Background="{TemplateBinding Foreground, Converter={StaticResource BrushRoundConverter}}"/>
-
-							<Border x:Name="SelectedBorder"
-                                    Opacity="0" CornerRadius="5"
-                                    Background="{TemplateBinding Foreground, Converter={StaticResource BrushRoundConverter}}"
-                                    RenderTransformOrigin="0.5,0.5">
-								<Border.RenderTransform>
-									<ScaleTransform ScaleX="1"/>
-								</Border.RenderTransform>
-							</Border>
-							<wpf:Ripple Feedback="{TemplateBinding Foreground, Converter={StaticResource BrushRoundConverter}}"
-                                        Focusable="False"
-                                        Content="{TemplateBinding Content}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        Padding="{TemplateBinding Padding}"/>
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsEnabled" Value="False">
-							<Setter Property="Opacity" Value=".56" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	--><!--ListBoxItem-->
-	
-	<!--Colors-->
-	<SolidColorBrush x:Key="PrimaryHueLightBrush" Color="{StaticResource Primary200}" />
-	<SolidColorBrush x:Key="PrimaryHueLightForegroundBrush" Color="{StaticResource Primary200Foreground}" />
-	<SolidColorBrush x:Key="PrimaryHueMidBrush" Color="{StaticResource AccentColor}" />
-	<SolidColorBrush x:Key="PrimaryHueMidForegroundBrush" Color="{StaticResource Primary500Foreground}" />
-	<SolidColorBrush x:Key="PrimaryHueDarkBrush" Color="{StaticResource Primary700}" />
-	<SolidColorBrush x:Key="PrimaryHueDarkForegroundBrush" Color="{StaticResource Primary700Foreground}" />
-	<!--Colors-->
-	
-	<!--RoundedButton--><!--
-	<Style x:Key="MaterialDesignRaisedRoundedButton" TargetType="{x:Type ButtonBase}">
-		<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
-		<Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}"/>
-		<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
-		<Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidForegroundBrush}"/>
-		<Setter Property="wpf:RippleAssist.Feedback" Value="White" />
-		<Setter Property="Cursor" Value="Hand"/>
-		<Setter Property="wpf:ShadowAssist.ShadowDepth" Value="Depth1" />
-		<Setter Property="TextBlock.FontWeight" Value="Medium"/>
-		<Setter Property="TextBlock.FontSize" Value="14"/>
-		<Setter Property="BorderThickness" Value="1"/>
-		<Setter Property="HorizontalContentAlignment" Value="Center"/>
-		<Setter Property="VerticalContentAlignment" Value="Center"/>
-		<Setter Property="Padding" Value="16 4 16 4"/>
-		<Setter Property="Height" Value="32" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ButtonBase}">
-					<Grid>
-						<AdornerDecorator CacheMode="{Binding RelativeSource={RelativeSource Self}, Path=(wpf:ShadowAssist.CacheMode)}">
-							<Grid>
-								<Border Background="{TemplateBinding Background}" CornerRadius="20"
-                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                        BorderBrush="{TemplateBinding BorderBrush}"                                    
-                                        x:Name="border"
-                                        Effect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowDepth), Converter={x:Static converters:ShadowConverter.Instance}}" />
-								<Border HorizontalAlignment="Left" Background="{DynamicResource MaterialDesignBackground}" Opacity=".4">
-									<Border.Width>
-										<MultiBinding Converter="{StaticResource RangeLengthConverter}">
-											<Binding Path="(wpf:ButtonProgressAssist.Minimum)" RelativeSource="{RelativeSource TemplatedParent}" />
-											<Binding Path="(wpf:ButtonProgressAssist.Maximum)" RelativeSource="{RelativeSource TemplatedParent}" />
-											<Binding Path="(wpf:ButtonProgressAssist.Value)" RelativeSource="{RelativeSource TemplatedParent}" />
-											<Binding Path="ActualWidth" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type ButtonBase}}" />
-										</MultiBinding>
-									</Border.Width>
-								</Border>
-							</Grid>
-						</AdornerDecorator>
-						<wpf:Ripple Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False"     
-                                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                    Padding="{TemplateBinding Padding}" 
-                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="true">
-							<Setter TargetName="border" Property="wpf:ShadowAssist.Darken" Value="True" />
-						</Trigger>
-						<Trigger Property="IsKeyboardFocused" Value="true">
-							<Setter TargetName="border" Property="wpf:ShadowAssist.Darken" Value="True" />
-						</Trigger>
-						<Trigger Property="IsEnabled" Value="false">
-							<Setter Property="Opacity" Value="0.23"/>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	--><!--RoundedButton-->
-
-	
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index d67a4b275..808aa4b5d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -125,10 +125,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Resources\MaterialOverride.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Resources\Styles.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/JobsView.xaml
index a09d3ab19..ddf827955 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/JobsView.xaml
@@ -34,7 +34,7 @@
             <Border.Effect>
                 <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" />
             </Border.Effect>
-            <TextBlock VerticalAlignment="Center" Margin="20" FontSize="25" FontWeight="SemiBold">JOBS</TextBlock>
+            <TextBlock VerticalAlignment="Center" Margin="20" FontSize="{StaticResource TangoPageHeaderFontSize}" FontWeight="SemiBold">Jobs</TextBlock>
         </Border>
 
         <Grid Grid.Row="1">
@@ -49,7 +49,7 @@
                 <touch:TouchIconButton Padding="20" Icon="Refresh" Style="{StaticResource TangoRoundTouchIconButton}"></touch:TouchIconButton>
             </StackPanel>
 
-            <touch:TouchNavigationLinks VerticalAlignment="Bottom" Margin="20" FontSize="{StaticResource NavigationLinks-Font-Size}">
+            <touch:TouchNavigationLinks VerticalAlignment="Bottom" Margin="20">
                 <sys:String>READY TO DYE</sys:String>
                 <sys:String>NOT READY</sys:String>
                 <sys:String>ALL</sys:String>
@@ -69,16 +69,16 @@
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
                         <DataGridTextColumn Width="90" Header="Status" Binding="{Binding JobStatus,Converter={StaticResource EnumToDescriptionConverter}}"></DataGridTextColumn>
-                        <DataGridTextColumn Width="256" Header="Name"  Binding="{Binding Name}"></DataGridTextColumn>
-                        <DataGridTextColumn Width="110" Header="Length (m)" Binding="{Binding Length,StringFormat=0.0}"></DataGridTextColumn>
-                        <DataGridTemplateColumn Header="Colors" SortMemberPath="Segments.Count" Width="80">
+                        <DataGridTextColumn Width="240" Header="Name"  Binding="{Binding Name}"></DataGridTextColumn>
+                        <DataGridTextColumn Width="117" Header="Length (m)" Binding="{Binding Length,StringFormat=0.0}"></DataGridTextColumn>
+                        <DataGridTemplateColumn Header="Colors" SortMemberPath="Segments.Count" Width="85">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
                                     <ContentControl Content="{Binding Segments,Converter={StaticResource SegmentsToPieConverter}}" Width="23" Height="23" HorizontalAlignment="Left"></ContentControl>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTextColumn Width="95" Header="Updated" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></DataGridTextColumn>
+                        <DataGridTextColumn Width="100" Header="Updated" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateConverter}}"></DataGridTextColumn>
                         <DataGridTemplateColumn x:Name="userSortColumn" SortMemberPath="JobIndex" SortDirection="Ascending" Width="78" CanUserSort="False">
                             <DataGridTemplateColumn.HeaderStyle>
                                 <Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource {x:Type DataGridColumnHeader}}">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 9071a24b8..e039ad14e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -28,11 +28,11 @@
                                 <StackPanel Margin="5 0 0 0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
                                     <Image Source="/Images/account.png" RenderOptions.BitmapScalingMode="Fant" VerticalAlignment="Center" Width="50" Height="50"></Image>
                                     <StackPanel Margin="0 5 0 0">
-                                        <TextBlock FontSize="16" TextTrimming="CharacterEllipsis" MaxWidth="170" FontStyle="Italic" FontWeight="Bold" Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding AuthenticationProvider.CurrentUser.Contact.FullName}"></TextBlock>
+                                        <TextBlock FontSize="16" TextTrimming="CharacterEllipsis" MaxWidth="170" FontStyle="Italic" FontWeight="Bold" Margin="10 0 0 0" VerticalAlignment="Center" Text="{Binding AuthenticationProvider.CurrentUser.Contact.FullName,FallbackValue='User Full Name'}"></TextBlock>
                                         <TextBlock FontSize="12" TextTrimming="CharacterEllipsis" MaxWidth="170" FontStyle="Italic" Margin="10 5 0 0" VerticalAlignment="Center">
-                                        <Run Text="{Binding AuthenticationProvider.CurrentUser.Organization.Name}"></Run>
+                                        <Run Text="{Binding AuthenticationProvider.CurrentUser.Organization.Name,FallbackValue='Organization'}"></Run>
                                         ,
-                                        <Run Text="{Binding AuthenticationProvider.CurrentUser.Roles[0].Name}">
+                                        <Run Text="{Binding AuthenticationProvider.CurrentUser.Roles[0].Name,FallbackValue='User Roles'}">
                                             <Run.ToolTip>
                                                 <ItemsControl ItemsSource="{Binding AuthenticationProvider.CurrentUser.Roles}">
                                                     <ItemsControl.ItemTemplate>
@@ -52,33 +52,23 @@
                                 </StackPanel>
                             </Grid>
                             <StackPanel Margin="0 16 0 0">
-                                <ListBoxItem>
-                                    <i:Interaction.Triggers>
-                                        <i:EventTrigger EventName="PreviewMouseUp">
-                                            <i:InvokeCommandAction Command="{Binding HomeCommand}"></i:InvokeCommandAction>
-                                        </i:EventTrigger>
-                                    </i:Interaction.Triggers>
-                                    <StackPanel Orientation="Horizontal">
+                                <touch:TouchButton Style="{StaticResource TangoFlatButton}">
+                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                         <fa:ImageAwesome VerticalAlignment="Center" Icon="Home" Width="32" Height="32"></fa:ImageAwesome>
                                         <TextBlock FontSize="16" VerticalAlignment="Center" Margin="10 0 0 0">Home</TextBlock>
                                     </StackPanel>
-                                </ListBoxItem>
+                                </touch:TouchButton>
                             </StackPanel>
                         </StackPanel>
 
                         <StackPanel DockPanel.Dock="Bottom">
                             <Separator Margin="0 10 0 0" Background="Gainsboro" />
-                            <ListBoxItem>
-                                <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="PreviewMouseUp">
-                                        <i:InvokeCommandAction Command="{Binding SignoutCommand}"></i:InvokeCommandAction>
-                                    </i:EventTrigger>
-                                </i:Interaction.Triggers>
-                                <StackPanel Orientation="Horizontal">
+                            <touch:TouchButton Style="{StaticResource TangoFlatButton}">
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                     <fa:ImageAwesome VerticalAlignment="Center" Icon="SignOut" Width="32" Height="32"></fa:ImageAwesome>
-                                    <TextBlock FontSize="16" VerticalAlignment="Center" Margin="10 0 0 0">Sign out</TextBlock>
+                                    <TextBlock FontSize="16" VerticalAlignment="Center" Margin="10 0 0 0">Sign Out</TextBlock>
                                 </StackPanel>
-                            </ListBoxItem>
+                            </touch:TouchButton>
                         </StackPanel>
                     </DockPanel>
                 </Border>
@@ -87,7 +77,7 @@
             <DockPanel>
                 <Border BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}" DockPanel.Dock="Top">
                     <DockPanel>
-                        <Border Padding="20" BorderThickness="0 0 1 0" BorderBrush="{StaticResource BorderColorBrush}">
+                        <Border Padding="20" BorderThickness="0 0 1 0" BorderBrush="{StaticResource TangoDividerBrush}">
                             <touch:TouchToggleButton Width="50" Height="50" Foreground="{StaticResource TangoPrimaryAccentBrush}" Style="{StaticResource TangoTouchToggleButtonHamburger}" IsChecked="{Binding ElementName=menu,Path=IsOpened}">
                                 <ToggleButton.Effect>
                                     <DropShadowEffect ShadowDepth="15" BlurRadius="20" Color="Silver" />
@@ -96,7 +86,7 @@
                         </Border>
                         <Grid>
                             <StackPanel HorizontalAlignment="Right" Margin="30 0" Orientation="Horizontal">
-                                <touch:TouchButton Height="54" FontSize="{StaticResource Button-Font-Size}" Padding="0" Width="184" CornerRadius="30" BlurRadius="20">
+                                <touch:TouchButton Height="54" Padding="0" Width="184" CornerRadius="30" BlurRadius="20">
                                     DYE
                                 </touch:TouchButton>
                             </StackPanel>