diff --git a/Modules/SicModules/Config/TM/DeviceModelSystem.xml b/Modules/SicModules/Config/TM/DeviceModelSystem.xml
index f5a6a0f..1983fc3 100644
--- a/Modules/SicModules/Config/TM/DeviceModelSystem.xml
+++ b/Modules/SicModules/Config/TM/DeviceModelSystem.xml
@@ -91,6 +91,7 @@
   </IoSensors>
   <IoPumps classType="SicModules.Devices.IoPump" assembly="SicModules">
     <IoPump id="TMPump1" module="TM" display="Pump1" schematicId="TMPump1" unit="" diRunning="DI_TMDryPump1Running" diAlarm="DI_TMDryPump1Alarm" diWarning="DI_TMDryPump1Warning" />
+    <IoPump id="TMPump2" module="TM" display="Pump2" schematicId="TMPump2" unit="" diRunning="DI_TMDryPump2Running" diAlarm="DI_TMDryPump2Alarm" diWarning="DI_TMDryPump2Warning"/>
   </IoPumps>
   <IoValves classType="Aitex.Core.RT.Device.Devices.IoValve" assembly="MECF.Framework.RT.EquipmentLibrary">
     <IoValve id="LoadSlowPump" module="TM" display="V84" schematicId="LoadSlowPump" unit="" isNc="true" isDefaultOpen="false" diOpen="DI_LoadSlowPumpFB" doOpen="DO_LoadSlowPump" />
diff --git a/Modules/SicModules/Config/TM/IODefinePlatform.xml b/Modules/SicModules/Config/TM/IODefinePlatform.xml
index ec919c1..0f58c5e 100644
--- a/Modules/SicModules/Config/TM/IODefinePlatform.xml
+++ b/Modules/SicModules/Config/TM/IODefinePlatform.xml
@@ -56,6 +56,9 @@
 			<DI_ITEM Index="73" Name="DI_UnloadStationWaferCYOpened" BufferOffset="73" Addr="73" Description="" Visible="false"/>
 			<DI_ITEM Index="74" Name="DI_UnloadStationLifterCYUp" BufferOffset="74" Addr="74" Description="" Visible="false"/>
 			<DI_ITEM Index="75" Name="DI_UnloadStationLifterCYDown" BufferOffset="75" Addr="75" Description="" Visible="false"/>
+      <DI_ITEM Index="78" Name="DI_TMDryPump2Alarm" BufferOffset="78" Addr="78" Description="" />
+      <DI_ITEM Index="79" Name="DI_TMDryPump2Warning" BufferOffset="79" Addr="79" Description="" />
+      <DI_ITEM Index="86" Name="DI_TMDryPump2Running" BufferOffset="86" Addr="86" Description="" />
 			<DI_ITEM Index="88" Name="DI_TMPressure1ATM" BufferOffset="88" Addr="88" Description="" />
 			<DI_ITEM Index="89" Name="DI_TMPressure1VAC" BufferOffset="89" Addr="89" Description="" />
 			<DI_ITEM Index="90" Name="DI_LoadPressureATM" BufferOffset="90" Addr="90" Description="" />
diff --git a/SicSimulator/Config/IODefinePlatform.xml b/SicSimulator/Config/IODefinePlatform.xml
index 61391e7..d5caaf6 100644
--- a/SicSimulator/Config/IODefinePlatform.xml
+++ b/SicSimulator/Config/IODefinePlatform.xml
@@ -56,6 +56,9 @@
 		  <DI_ITEM Index="73" Name="DI_UnloadStationWaferCYOpened" BufferOffset="73" Addr="73" Description="" Visible="false"/>
 		  <DI_ITEM Index="74" Name="DI_UnloadStationLifterCYUp" BufferOffset="74" Addr="74" Description="" Visible="false"/>
 		  <DI_ITEM Index="75" Name="DI_UnloadStationLifterCYDown" BufferOffset="75" Addr="75" Description="" Visible="false"/>
+      <DI_ITEM Index="78" Name="DI_TMDryPump2Alarm" BufferOffset="78" Addr="78" Description="" />
+      <DI_ITEM Index="79" Name="DI_TMDryPump2Warning" BufferOffset="79" Addr="79" Description="" />
+      <DI_ITEM Index="86" Name="DI_TMDryPump2Running" BufferOffset="86" Addr="86" Description="" />
 		  <DI_ITEM Index="88" Name="DI_TMPressure1ATM" BufferOffset="88" Addr="88" Description="" />
 		  <DI_ITEM Index="89" Name="DI_TMPressure1VAC" BufferOffset="89" Addr="89" Description="" />
 		  <DI_ITEM Index="90" Name="DI_LoadPressureATM" BufferOffset="90" Addr="90" Description="" />
diff --git a/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml b/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml
index ccd319f..5c88456 100644
--- a/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml
+++ b/SicUI/Controls/Mainframe/M2C4EFEMView3.xaml
@@ -76,48 +76,7 @@
                         </TransformGroup>
                     </unitControls:Door.RenderTransform>
                 </unitControls:Door>
-                <!--  Tray和晶圆  -->
-                <Canvas Visibility="{Binding IsPM1Installed, Converter={StaticResource BoolVisibilityConverter}}">
-                    <Image
-                        Canvas.Left="248"
-                        Canvas.Top="182"
-                        Width="80"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        Source="Images/pm52.png"
-                        Visibility="{Binding PM1HaveTray}" />
-                    <controls:WaferCtrl
-                        Canvas.Left="262"
-                        Canvas.Top="192"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        IsEnabled="{Binding PM1EnableWaferClick}"
-                        IsRotary="{Binding IsPm1WaferRotary}"
-                        WaferData="{Binding PM1Wafer}" />
-                    <controls:WaferCtrl
-                        Canvas.Left="292"
-                        Canvas.Top="202"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        IsEnabled="{Binding PM1EnableWaferClick}"
-                        IsRotary="{Binding IsPm1WaferRotary}"
-                        WaferData="{Binding PM1Wafer}" />
-                    <controls:WaferCtrl
-                        Canvas.Left="266"
-                        Canvas.Top="224"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        IsEnabled="{Binding PM1EnableWaferClick}"
-                        IsRotary="{Binding IsPm1WaferRotary}"
-                        WaferData="{Binding PM1Wafer}" />
-
-                </Canvas>
+              
             </Canvas>
             <Canvas Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}">
                 <TextBlock
@@ -164,47 +123,7 @@
                     </unitControls:Door.RenderTransform>
                 </unitControls:Door>
                 <!--  Tray和晶圆  -->
-                <Canvas Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}">
-                    <Image
-                        Canvas.Left="431"
-                        Canvas.Top="185"
-                        Width="80"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Source="Images/pm52.png"
-                        Visibility="{Binding PM2HaveTray}" />
-                    <controls:WaferCtrl
-                        Canvas.Left="444"
-                        Canvas.Top="195"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        IsEnabled="{Binding PM2EnableWaferClick}"
-                        IsRotary="{Binding IsPm2WaferRotary}"
-                        WaferData="{Binding PM2Wafer}" />
-
-                    <controls:WaferCtrl
-                        Canvas.Left="475"
-                        Canvas.Top="205"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        IsEnabled="{Binding PM2EnableWaferClick}"
-                        IsRotary="{Binding IsPm2WaferRotary}"
-                        WaferData="{Binding PM2Wafer}" />
-                    <controls:WaferCtrl
-                        Canvas.Left="449"
-                        Canvas.Top="227"
-                        Width="30"
-                        Height="30"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        IsEnabled="{Binding PM2EnableWaferClick}"
-                        IsRotary="{Binding IsPm2WaferRotary}"
-                        WaferData="{Binding PM2Wafer}" />
-                </Canvas>
+              
             </Canvas>
 
             <Canvas Visibility="{Binding IsLoadLockInstalled, Converter={StaticResource BoolVisibilityConverter}}">
@@ -314,7 +233,7 @@
                     Visibility="{Binding PM1HaveTray}" />
                 <controls:WaferCtrl
                     Canvas.Left="258"
-                    Canvas.Top="191"
+                    Canvas.Top="192"
                     Width="60"
                     Height="60"
                     IsEnabled="{Binding PM1EnableWaferClick}"
@@ -330,8 +249,8 @@
                     Source="Images/pm52.png"
                     Visibility="{Binding PM2HaveTray}" />
                 <controls:WaferCtrl
-                    Canvas.Left="442"
-                    Canvas.Top="195"
+                    Canvas.Left="441"
+                    Canvas.Top="196"
                     Width="60"
                     Height="60"
                     IsEnabled="{Binding PM2EnableWaferClick}"
@@ -350,7 +269,7 @@
                     Source="Images/pm52.png"
                     Visibility="{Binding LoadLockHaveTray}" />
                 <controls:WaferCtrl
-                    Canvas.Left="464"
+                    Canvas.Left="460"
                     Canvas.Top="446"
                     Width="60"
                     Height="60"
diff --git a/SicUI/Models/Maintenances/TM/TMView.xaml b/SicUI/Models/Maintenances/TM/TMView.xaml
index ac2bf3d..1a27151 100644
--- a/SicUI/Models/Maintenances/TM/TMView.xaml
+++ b/SicUI/Models/Maintenances/TM/TMView.xaml
@@ -11,17 +11,17 @@
     xmlns:deviceControl="clr-namespace:Aitex.Core.UI.DeviceControl;assembly=MECF.Framework.UI.Core"
     xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
     xmlns:industrialcontrol="clr-namespace:MECF.Framework.UI.Client.IndustrialControl;assembly=MECF.Framework.UI.Client"
+    xmlns:lex="http://wpflocalizeextension.codeplex.com"
     xmlns:m2c4parts="clr-namespace:SicUI.Controls.M2C4Parts"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:unitControls="clr-namespace:MECF.Framework.UI.Client.Ctrlib.UnitControls;assembly=MECF.Framework.UI.Client"
-    xmlns:lex="http://wpflocalizeextension.codeplex.com"
     d:Background="#91b0cd"
     d:DesignHeight="800"
     d:DesignWidth="1920"
-    mc:Ignorable="d"
     lex:LocalizeDictionary.DesignCulture="en"
     lex:ResxLocalizationProvider.DefaultAssembly="Sicentury.Localization"
-    lex:ResxLocalizationProvider.DefaultDictionary="lang_common">
+    lex:ResxLocalizationProvider.DefaultDictionary="lang_common"
+    mc:Ignorable="d">
     <UserControl.Resources>
         <Color x:Key="EdgeColorWhite">DimGray</Color>
         <Color x:Key="CenterColorWhite">LightGray</Color>
@@ -89,8 +89,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="0,0,0,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -173,8 +173,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="0,0,0,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -220,16 +220,16 @@
                                 </Button>
                             </StackPanel>
                             <TextBlock
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 Width="100"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 FontFamily="Arial"
                                 FontSize="12"
                                 Foreground="{DynamicResource FG_Black}"
                                 TextAlignment="Left"
                                 TextWrapping="Wrap">
-                                <Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding PM1PurgeLoop, StringFormat=0.00 ,Mode=OneWay}" FontSize="12"/>
+                                <Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding PM1PurgeLoop, StringFormat=0.00, Mode=OneWay}" />
                             </TextBlock>
                         </Grid>
                     </Border>
@@ -241,8 +241,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -305,8 +305,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -498,8 +498,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="0,0,0,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -582,8 +582,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="0,0,0,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -629,16 +629,16 @@
                                 </Button>
                             </StackPanel>
                             <TextBlock
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 Width="100"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 FontFamily="Arial"
                                 FontSize="12"
                                 Foreground="{DynamicResource FG_Black}"
                                 TextAlignment="Left"
                                 TextWrapping="Wrap">
-                                <Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding PM2PurgeLoop, StringFormat=0.00,Mode=OneWay}" FontSize="12"/>
+                                <Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding PM2PurgeLoop, StringFormat=0.00, Mode=OneWay}" />
                             </TextBlock>
                         </Grid>
                     </Border>
@@ -650,8 +650,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -714,8 +714,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -1361,8 +1361,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="0,0,0,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -1446,9 +1446,9 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="0,0,0,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             Margin="0,7,0,0"
                             VerticalAlignment="Top"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -1492,17 +1492,17 @@
                                 </i:Interaction.Triggers>
                             </Button>
                             <TextBlock
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 Width="100"
                                 Margin="15,0,0,0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 FontFamily="Arial"
                                 FontSize="12"
                                 Foreground="{DynamicResource FG_Black}"
                                 TextAlignment="Left"
                                 TextWrapping="Wrap">
-                                <Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding LLPurgeLoop, StringFormat=0.00,Mode=OneWay}" FontSize="12"/>
+                                <Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding LLPurgeLoop, StringFormat=0.00, Mode=OneWay}" />
                             </TextBlock>
                         </StackPanel>
                     </Border>
@@ -1600,8 +1600,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -1657,8 +1657,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -1673,8 +1673,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="0,0,0,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -1736,8 +1736,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -1779,15 +1779,19 @@
                 Height="700"
                 Margin="10,-20"
                 VerticalAlignment="Top">
+
+
                 <Canvas
                     x:Name="GasLines1"
                     Canvas.Left="-16"
                     Canvas.Top="150">
                     <industrialcontrol:PipeLine
-                        Canvas.Left="45"
+                        Canvas.Left="43"
                         Canvas.Top="572"
                         Width="282"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorBlue}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
@@ -1796,10 +1800,12 @@
                         Visibility="Visible" />
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="491"
-                        Canvas.Top="122"
+                        Canvas.Left="443"
+                        Canvas.Top="147"
                         Width="56"
                         Height="8"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
@@ -1807,10 +1813,12 @@
                         RightDirection="Right"
                         Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="547"
-                        Canvas.Top="33"
+                        Canvas.Left="499"
+                        Canvas.Top="57"
                         Width="90"
                         Height="8"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
@@ -1823,10 +1831,12 @@
                     </industrialcontrol:PipeLine>
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="237"
-                        Canvas.Top="122"
+                        Canvas.Left="198"
+                        Canvas.Top="147"
                         Width="56"
                         Height="8"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="Right"
@@ -1834,10 +1844,12 @@
                         RightDirection="None"
                         Visibility="{Binding IsPM1Installed, Converter={StaticResource BoolVisibilityConverter}}" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="245"
-                        Canvas.Top="34"
+                        Canvas.Left="206"
+                        Canvas.Top="57"
                         Width="90"
                         Height="8"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
@@ -1849,49 +1861,26 @@
                         </industrialcontrol:PipeLine.RenderTransform>
                     </industrialcontrol:PipeLine>
 
-                    <!--<industrialcontrol:PipeLine
-                        Canvas.Left="238"
-                        Canvas.Top="262"
-                        Width="75"
+                    <industrialcontrol:PipeLine
+                        Canvas.Left="364"
+                        Canvas.Top="338"
+                        Width="85"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="Right"
-                        MoveSpeed="{Binding V70MoveSpeed}"
-                        RightDirection="None"
-                        Visibility="Visible" />-->
-                    <!--<industrialcontrol:PipeLine
-                        Canvas.Left="246"
-                        Canvas.Top="237"
-                        Width="26"
-                        Height="8"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        LeftDirection="None"
-                        MoveSpeed="{Binding V70MoveSpeed}"
-                        RightDirection="None"
-                        Visibility="Visible">
-                        <industrialcontrol:PipeLine.RenderTransform>
-                            <RotateTransform Angle="90" />
-                        </industrialcontrol:PipeLine.RenderTransform>
-                    </industrialcontrol:PipeLine>-->
-
-                    <industrialcontrol:PipeLine
-                        Canvas.Left="426"
-                        Canvas.Top="307"
-                        Width="40"
-                        Height="8"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        LeftDirection="None"
                         MoveSpeed="{Binding V85MoveSpeed2}"
-                        RightDirection="Right"
+                        RightDirection="None"
                         Visibility="Visible" />
                     <industrialcontrol:PipeLine
-                        Canvas.Left="466"
-                        Canvas.Top="262"
+                        Canvas.Left="372"
+                        Canvas.Top="292"
                         Width="46"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
@@ -1903,73 +1892,13 @@
                         </industrialcontrol:PipeLine.RenderTransform>
                     </industrialcontrol:PipeLine>
 
-                    <!--<industrialcontrol:PipeLineThree
-                        Canvas.Left="647"
-                        Canvas.Top="-115"
-                        Width="100"
-                        Height="34"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        MoveSpeed1="{Binding V78MoveSpeed}"
-                        MoveSpeed2="0"
-                        MoveSpeed3="{Binding V77MoveSpeed2}"
-                        PipeWidth="8" />-->
-
-                    <!--<industrialcontrol:PipeLineThree
-                        Canvas.Left="699"
-                        Canvas.Top="-81"
-                        Width="108"
-                        Height="28"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        MoveSpeed1="{Binding V77V78MoveSpeed}"
-                        MoveSpeed2="0"
-                        MoveSpeed3="{Binding V79MoveSpeed2}"
-                        PipeWidth="8" />-->
-
-                    <!--<industrialcontrol:PipeLineThree
-                        Canvas.Left="735"
-                        Canvas.Top="161"
-                        Width="61"
-                        Height="171"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        MoveSpeed1="{Binding V79MoveSpeed2}"
-                        MoveSpeed2="{Binding V80MoveSpeed2}"
-                        MoveSpeed3="0"
-                        PipeWidth="8">
-                        <industrialcontrol:PipeLineThree.RenderTransform>
-                            <TransformGroup>
-                                <ScaleTransform />
-                                <SkewTransform />
-                                <RotateTransform Angle="90" />
-                                <TranslateTransform />
-                            </TransformGroup>
-                        </industrialcontrol:PipeLineThree.RenderTransform>
-                    </industrialcontrol:PipeLineThree>-->
-
-
-                    <!--<industrialcontrol:PipeLine
-                        Canvas.Left="757"
-                        Canvas.Top="-53"
-                        Width="407"
-                        Height="8"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        LeftDirection="None"
-                        MoveSpeed="{Binding V79MoveSpeed2}"
-                        RightDirection="Left"
-                        Visibility="Visible">
-                        <industrialcontrol:PipeLine.RenderTransform>
-                            <RotateTransform Angle="90" />
-                        </industrialcontrol:PipeLine.RenderTransform>
-                    </industrialcontrol:PipeLine>-->
-
                     <industrialcontrol:PipeLine
-                        Canvas.Left="431"
+                        Canvas.Left="471"
                         Canvas.Top="360"
                         Width="43"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
@@ -1982,10 +1911,12 @@
                     </industrialcontrol:PipeLine>
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="431"
+                        Canvas.Left="471"
                         Canvas.Top="504"
                         Width="14"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
@@ -1998,10 +1929,12 @@
                     </industrialcontrol:PipeLine>
 
                     <industrialcontrol:PipeLineThree
-                        Canvas.Left="423"
+                        Canvas.Left="463"
                         Canvas.Top="471"
                         Width="68"
                         Height="41"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         MoveSpeed1="{Binding V83MoveSpeed}"
@@ -2015,10 +1948,12 @@
                     </industrialcontrol:PipeLineThree>
 
                     <industrialcontrol:PipeLineThree
-                        Canvas.Left="423"
+                        Canvas.Left="463"
                         Canvas.Top="466"
                         Width="38"
                         Height="41"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         MoveSpeed1="{Binding V83MoveSpeed2}"
@@ -2037,10 +1972,12 @@
                     </industrialcontrol:PipeLineThree>
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="472"
+                        Canvas.Left="512"
                         Canvas.Top="433"
                         Width="56"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="Left"
@@ -2051,118 +1988,13 @@
                         </industrialcontrol:PipeLine.RenderTransform>
                     </industrialcontrol:PipeLine>
 
-
-                    <!--<industrialcontrol:PipeLine
-                        Canvas.Left="220"
-                        Canvas.Top="249"
-                        Width="165"
-                        Height="8"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        LeftDirection="None"
-                        MoveSpeed="{Binding V122V123MoveSpeed2}"
-                        RightDirection="None"
-                        Visibility="Visible">
-                        <industrialcontrol:PipeLine.RenderTransform>
-                            <RotateTransform Angle="90" />
-                        </industrialcontrol:PipeLine.RenderTransform>
-                    </industrialcontrol:PipeLine>-->
-                    <!--<industrialcontrol:PipeLine
-                        Canvas.Left="73"
-                        Canvas.Top="189"
-                        Width="125"
-                        Height="8"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        LeftDirection="Right"
-                        MoveSpeed="{Binding V78MoveSpeed2}"
-                        RightDirection="None"
-                        Visibility="Visible" />-->
-                    <!--<industrialcontrol:PipeLine
-                        Canvas.Left="81"
-                        Canvas.Top="-115"
-                        Width="304"
-                        Height="8"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        LeftDirection="Right"
-                        MoveSpeed="{Binding V78MoveSpeed2}"
-                        RightDirection="None"
-                        Visibility="Visible">
-                        <industrialcontrol:PipeLine.RenderTransform>
-                            <RotateTransform Angle="90" />
-                        </industrialcontrol:PipeLine.RenderTransform>
-                    </industrialcontrol:PipeLine>-->
-                    <!--<industrialcontrol:PipeLine
-                        Canvas.Left="80"
-                        Canvas.Top="-115"
-                        Width="567"
-                        Height="8"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        LeftDirection="None"
-                        MoveSpeed="{Binding V78MoveSpeed}"
-                        RightDirection="None"
-                        Visibility="Visible" />-->
-
-
-                    <!--<industrialcontrol:PipeLineThree
-                        Canvas.Left="212"
-                        Canvas.Top="469"
-                        Width="68"
-                        Height="41"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        MoveSpeed1="{Binding V122MoveSpeed}"
-                        MoveSpeed2="0"
-                        MoveSpeed3="{Binding V123MoveSpeed2}"
-                        PipeWidth="8"
-                        Visibility="Visible">
-                        <industrialcontrol:PipeLineThree.RenderTransform>
-                            <RotateTransform Angle="-90" />
-                        </industrialcontrol:PipeLineThree.RenderTransform>
-                    </industrialcontrol:PipeLineThree>-->
-
-                    <!--<industrialcontrol:PipeLineThree
-                        Canvas.Left="212"
-                        Canvas.Top="464"
-                        Width="38"
-                        Height="41"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        MoveSpeed1="{Binding V122MoveSpeed2}"
-                        MoveSpeed2="0"
-                        MoveSpeed3="{Binding V123MoveSpeed}"
-                        PipeWidth="8"
-                        Visibility="Visible">
-                        <industrialcontrol:PipeLineThree.RenderTransform>
-                            <TransformGroup>
-                                <ScaleTransform ScaleX="-1.0" />
-                                <SkewTransform />
-                                <RotateTransform Angle="-90" />
-                                <TranslateTransform />
-                            </TransformGroup>
-                        </industrialcontrol:PipeLineThree.RenderTransform>
-                    </industrialcontrol:PipeLineThree>-->
-                    <!--<industrialcontrol:PipeLine
-                        Canvas.Left="261"
-                        Canvas.Top="431"
-                        Width="56"
-                        Height="8"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        LeftDirection="Left"
-                        MoveSpeed="{Binding V123MoveSpeed2}"
-                        RightDirection="Left">
-                        <industrialcontrol:PipeLine.RenderTransform>
-                            <RotateTransform Angle="90" />
-                        </industrialcontrol:PipeLine.RenderTransform>
-                    </industrialcontrol:PipeLine>-->
                     <industrialcontrol:PipeLine
                         Canvas.Left="750"
-                        Canvas.Top="354"
-                        Width="310"
+                        Canvas.Top="304"
+                        Width="260"
                         Height="8"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
@@ -2178,8 +2010,10 @@
                     <industrialcontrol:PipeLine
                         Canvas.Left="758"
                         Canvas.Top="-53"
-                        Width="407"
+                        Width="357"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
@@ -2210,7 +2044,7 @@
                     <industrialcontrol:PipeLine
                         Canvas.Left="699"
                         Canvas.Top="-73"
-                        Width="302"
+                        Width="349"
                         Height="8"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
@@ -2226,10 +2060,12 @@
 
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="398"
+                        Canvas.Left="350"
                         Canvas.Top="-81"
                         Width="178"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="Right"
@@ -2244,55 +2080,55 @@
                     </industrialcontrol:PipeLine>
 
                     <!--<industrialcontrol:PipeLine
-                        Canvas.Left="220"
-                        Canvas.Top="502"
-                        Width="20"
-                        Height="8"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        LeftDirection="None"
-                        MoveSpeed="{Binding V122V123MoveSpeed2}"
-                        RightDirection="None"
-                        Visibility="Visible">
-                        <industrialcontrol:PipeLine.RenderTransform>
-                            <TransformGroup>
-                                <RotateTransform Angle="90" />
-                            </TransformGroup>
-                        </industrialcontrol:PipeLine.RenderTransform>
-                    </industrialcontrol:PipeLine>-->
+    Canvas.Left="220"
+    Canvas.Top="502"
+    Width="20"
+    Height="8"
+    CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
+    EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
+    LeftDirection="None"
+    MoveSpeed="{Binding V122V123MoveSpeed2}"
+    RightDirection="None"
+    Visibility="Visible">
+    <industrialcontrol:PipeLine.RenderTransform>
+        <TransformGroup>
+            <RotateTransform Angle="90" />
+        </TransformGroup>
+    </industrialcontrol:PipeLine.RenderTransform>
+</industrialcontrol:PipeLine>-->
                     <!--<industrialcontrol:PipeLine
-                        Canvas.Left="212"
-                        Canvas.Top="521"
-                        Width="200"
-                        Height="8"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        LeftDirection="Right"
-                        MoveSpeed="{Binding V122V123MoveSpeed2}"
-                        RightDirection="None"
-                        Visibility="Visible" />-->
+    Canvas.Left="212"
+    Canvas.Top="521"
+    Width="200"
+    Height="8"
+    CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
+    EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
+    LeftDirection="Right"
+    MoveSpeed="{Binding V122V123MoveSpeed2}"
+    RightDirection="None"
+    Visibility="Visible" />-->
                     <!--<industrialcontrol:PipeLineThree
-                        Canvas.Left="377"
-                        Canvas.Top="615"
-                        Width="148"
-                        Height="48"
-                        CenterColor="{StaticResource ResourceKey=CenterColorBlue}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        PipeWidth="8"
-                        Visibility="Visible">
-                        <industrialcontrol:PipeLineThree.RenderTransform>
-                            <TransformGroup>
-                                <ScaleTransform ScaleX="-1.0" />
-                                <SkewTransform />
-                                <RotateTransform Angle="180" />
-                                <TranslateTransform />
-                            </TransformGroup>
-                        </industrialcontrol:PipeLineThree.RenderTransform>
-                    </industrialcontrol:PipeLineThree>-->
+    Canvas.Left="377"
+    Canvas.Top="615"
+    Width="148"
+    Height="48"
+    CenterColor="{StaticResource ResourceKey=CenterColorBlue}"
+    EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
+    PipeWidth="8"
+    Visibility="Visible">
+    <industrialcontrol:PipeLineThree.RenderTransform>
+        <TransformGroup>
+            <ScaleTransform ScaleX="-1.0" />
+            <SkewTransform />
+            <RotateTransform Angle="180" />
+            <TranslateTransform />
+        </TransformGroup>
+    </industrialcontrol:PipeLineThree.RenderTransform>
+</industrialcontrol:PipeLineThree>-->
                     <industrialcontrol:PipeLine
-                        Canvas.Left="379"
+                        Canvas.Left="510"
                         Canvas.Top="603"
-                        Width="340"
+                        Width="210"
                         Height="8"
                         CenterColor="{StaticResource ResourceKey=CenterColorBlue}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
@@ -2301,41 +2137,51 @@
                         Visibility="Visible" />
 
 
-                    <industrialcontrol:PipeLine
-                        Canvas.Left="368"
-                        Canvas.Top="518"
-                        Width="63"
-                        Height="8"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        LeftDirection="None"
-                        MoveSpeed="{Binding V83V84MoveSpeed}"
-                        RightDirection="Right"
-                        Visibility="Visible" />
+
                     <!--<industrialcontrol:PipeLine
-                        Canvas.Left="571"
-                        Canvas.Top="529"
-                        Width="73"
+    Canvas.Left="571"
+    Canvas.Top="529"
+    Width="73"
+    Height="8"
+    CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
+    EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
+    LeftDirection="None"
+    MoveSpeed="{Binding V83V84V122V123MoveSpeed2}"
+    RightDirection="None"
+    Visibility="Visible">
+    <industrialcontrol:PipeLine.RenderTransform>
+        <RotateTransform Angle="90" />
+    </industrialcontrol:PipeLine.RenderTransform>
+</industrialcontrol:PipeLine>-->
+                    <industrialcontrol:PipeLine
+                        Canvas.Left="333"
+                        Canvas.Top="503"
+                        Width="100"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
-                        MoveSpeed="{Binding V83V84V122V123MoveSpeed2}"
+                        MoveSpeed="{Binding V81V82MoveSpeed2}"
                         RightDirection="None"
                         Visibility="Visible">
                         <industrialcontrol:PipeLine.RenderTransform>
                             <RotateTransform Angle="90" />
                         </industrialcontrol:PipeLine.RenderTransform>
-                    </industrialcontrol:PipeLine>-->
+                    </industrialcontrol:PipeLine>
+
                     <industrialcontrol:PipeLine
-                        Canvas.Left="335"
-                        Canvas.Top="541"
-                        Width="50"
+                        Canvas.Left="471"
+                        Canvas.Top="503"
+                        Width="100"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
-                        MoveSpeed="{Binding V81V82V83V84MoveSpeed}"
+                        MoveSpeed="{Binding V83V84MoveSpeed2}"
                         RightDirection="None"
                         Visibility="Visible">
                         <industrialcontrol:PipeLine.RenderTransform>
@@ -2344,32 +2190,34 @@
                     </industrialcontrol:PipeLine>
 
                     <!--<industrialcontrol:PipeLineThree
-                        Canvas.Left="451"
-                        Canvas.Top="529"
-                        Width="48"
-                        Height="31"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        MoveSpeed1="{Binding V122V123MoveSpeed}"
-                        MoveSpeed2="{Binding V83V84MoveSpeed}"
-                        MoveSpeed3="0"
-                        PipeWidth="8"
-                        Visibility="Visible">
-                        <industrialcontrol:PipeLineThree.RenderTransform>
-                            <TransformGroup>
-                                <ScaleTransform />
-                                <SkewTransform />
-                                <RotateTransform Angle="180" />
-                                <TranslateTransform />
-                            </TransformGroup>
-                        </industrialcontrol:PipeLineThree.RenderTransform>
-                    </industrialcontrol:PipeLineThree>-->
+    Canvas.Left="451"
+    Canvas.Top="529"
+    Width="48"
+    Height="31"
+    CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
+    EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
+    MoveSpeed1="{Binding V122V123MoveSpeed}"
+    MoveSpeed2="{Binding V83V84MoveSpeed}"
+    MoveSpeed3="0"
+    PipeWidth="8"
+    Visibility="Visible">
+    <industrialcontrol:PipeLineThree.RenderTransform>
+        <TransformGroup>
+            <ScaleTransform />
+            <SkewTransform />
+            <RotateTransform Angle="180" />
+            <TranslateTransform />
+        </TransformGroup>
+    </industrialcontrol:PipeLineThree.RenderTransform>
+</industrialcontrol:PipeLineThree>-->
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="375"
+                        Canvas.Left="373"
                         Canvas.Top="432"
                         Width="56"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="Left"
@@ -2382,10 +2230,12 @@
 
 
                     <industrialcontrol:PipeLine
-                        Canvas.Left="335"
+                        Canvas.Left="333"
                         Canvas.Top="260"
                         Width="163"
                         Height="8"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         LeftDirection="None"
@@ -2398,10 +2248,12 @@
                     </industrialcontrol:PipeLine>
 
                     <industrialcontrol:PipeLineThree
-                        Canvas.Left="327"
+                        Canvas.Left="325"
                         Canvas.Top="450"
                         Width="28"
                         Height="41"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         MoveSpeed1="{Binding V81MoveSpeed}"
@@ -2415,10 +2267,12 @@
                     </industrialcontrol:PipeLineThree>
 
                     <industrialcontrol:PipeLineThree
-                        Canvas.Left="327"
+                        Canvas.Left="325"
                         Canvas.Top="465"
                         Width="38"
                         Height="41"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
                         EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
                         MoveSpeed1="{Binding V81MoveSpeed2}"
@@ -2436,34 +2290,18 @@
                         </industrialcontrol:PipeLineThree.RenderTransform>
                     </industrialcontrol:PipeLineThree>
 
-                    <industrialcontrol:PipeLineThree
-                        Canvas.Left="327"
-                        Canvas.Top="503"
-                        Width="38"
-                        Height="41"
-                        CenterColor="{StaticResource ResourceKey=CenterColorWhite}"
-                        EdgeColor="{StaticResource ResourceKey=EdgeColorWhite}"
-                        MoveSpeed1="{Binding V81V82MoveSpeed2}"
-                        MoveSpeed2="0"
-                        MoveSpeed3="{Binding V83V84MoveSpeed}"
-                        PipeWidth="8"
-                        Visibility="Visible">
-                        <industrialcontrol:PipeLineThree.RenderTransform>
-                            <TransformGroup>
-                                <ScaleTransform ScaleX="-1.0" />
-                                <SkewTransform />
-                                <RotateTransform Angle="-90" />
-                                <TranslateTransform />
-                            </TransformGroup>
-                        </industrialcontrol:PipeLineThree.RenderTransform>
-                    </industrialcontrol:PipeLineThree>
+
+                </Canvas>
+                <Canvas ZIndex="1">
+                    <m2c4parts:M2C4EFEMView3
+                        x:Name="system"
+                        Canvas.Top="-78"
+                        Width="750"
+                        Height="640" />
                 </Canvas>
 
-                <m2c4parts:M2C4EFEMView2
-                    x:Name="system"
-                    Canvas.Top="-78"
-                    Width="750"
-                    Height="640" />
+
+
 
                 <Canvas
                     x:Name="Devices"
@@ -2471,7 +2309,10 @@
                     Canvas.Top="150"
                     IsEnabled="{Binding IsServiceMode}">
                     <Line
+                        Canvas.Left="40"
                         Canvas.Top="-25"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Stroke="Gray"
                         StrokeThickness="8"
                         X1="415"
@@ -2479,8 +2320,10 @@
                         Y1="415"
                         Y2="415" />
                     <Line
-                        Canvas.Left="-118"
+                        Canvas.Left="-121"
                         Canvas.Top="-150"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Stroke="Gray"
                         StrokeThickness="8"
                         X1="415"
@@ -2488,25 +2331,25 @@
                         Y1="540"
                         Y2="540" />
                     <!--<Line
-                        Canvas.Left="-2"
-                        Canvas.Top="101"
-                        Stroke="Gray"
-                        StrokeThickness="8"
-                        X1="196"
-                        X2="196"
-                        Y1="285"
-                        Y2="293" />-->
+    Canvas.Left="-2"
+    Canvas.Top="101"
+    Stroke="Gray"
+    StrokeThickness="8"
+    X1="196"
+    X2="196"
+    Y1="285"
+    Y2="293" />-->
 
                     <!--<Line
-                        Canvas.Left="6"
-                        Canvas.Top="-264"
-                        Panel.ZIndex="-1"
-                        Stroke="Gray"
-                        StrokeThickness="20"
-                        X1="196"
-                        X2="196"
-                        Y1="285"
-                        Y2="293" />-->
+    Canvas.Left="6"
+    Canvas.Top="-264"
+    Panel.ZIndex="-1"
+    Stroke="Gray"
+    StrokeThickness="20"
+    X1="196"
+    X2="196"
+    Y1="285"
+    Y2="293" />-->
 
                     <Path
                         Canvas.Left="773"
@@ -2535,29 +2378,35 @@
                     </Path>
 
                     <Label
-                        Canvas.Left="282"
+                        Canvas.Left="280"
                         Canvas.Top="462"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Content="V81" />
                     <Label
-                        Canvas.Left="456"
-                        Canvas.Top="281"
+                        Canvas.Left="362"
+                        Canvas.Top="311"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Content="V85" />
                     <Label
                         Canvas.Left="614"
-                        Canvas.Top="315"
+                        Canvas.Top="265"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         Content="V79" />
                     <!--<Label
-                        Canvas.Left="160"
-                        Canvas.Top="427"
-                        Content="V122" />
-                    <Label
-                        Canvas.Left="239"
-                        Canvas.Top="427"
-                        Content="V123" />-->
+    Canvas.Left="160"
+    Canvas.Top="427"
+    Content="V122" />
+<Label
+    Canvas.Left="239"
+    Canvas.Top="427"
+    Content="V123" />-->
                     <!--<Label
-                        Canvas.Left="481"
-                        Canvas.Top="-112"
-                        Content="V78" />-->
+    Canvas.Left="481"
+    Canvas.Top="-112"
+    Content="V78" />-->
                     <Label
                         Canvas.Left="582"
                         Canvas.Top="-63"
@@ -2567,55 +2416,69 @@
                         Canvas.Top="-63"
                         Content="MFC60" />
                     <Label
-                        Canvas.Left="170"
-                        Canvas.Top="96"
+                        Canvas.Left="131"
+                        Canvas.Top="115"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         Content="V70-1"
                         Visibility="{Binding IsPM1Installed, Converter={StaticResource BoolVisibilityConverter}}" />
                     <Label
-                        Canvas.Left="504"
-                        Canvas.Top="125"
+                        Canvas.Left="493"
+                        Canvas.Top="116"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         Content="V70-2"
                         Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}" />
                     <!--<Label
-                        Canvas.Left="614"
-                        Canvas.Top="158"
-                        Content="V80"/>-->
+    Canvas.Left="614"
+    Canvas.Top="158"
+    Content="V80"/>-->
                     <!--<Label
-                        Canvas.Left="232"
-                        Canvas.Top="271"
-                        Content="V124" />-->
+    Canvas.Left="232"
+    Canvas.Top="271"
+    Content="V124" />-->
                     <Label
                         Canvas.Left="751"
                         Canvas.Top="-73"
                         Content="V86" />
                     <Label
-                        Canvas.Left="378"
-                        Canvas.Top="432"
+                        Canvas.Left="416"
+                        Canvas.Top="463"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Content="V83" />
                     <Label
-                        Canvas.Left="453"
-                        Canvas.Top="432"
+                        Canvas.Left="495"
+                        Canvas.Top="463"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Content="V84" />
                     <Label
                         Canvas.Left="354"
                         Canvas.Top="463"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Content="V82" />
                     <!--<Label
-                        Canvas.Left="118"
-                        Canvas.Top="-7"
-                        Content="PT10" />-->
+    Canvas.Left="118"
+    Canvas.Top="-7"
+    Content="PT10" />-->
                     <Label
-                        Canvas.Left="500"
+                        Canvas.Left="548"
                         Canvas.Top="379"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Content="PT3" />
                     <Label
-                        Canvas.Left="192"
+                        Canvas.Left="183"
                         Canvas.Top="378"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         Content="PT4" />
                     <!--<Label
-                        Canvas.Left="125"
-                        Canvas.Top="354"
-                        Content="PT9" />-->
+    Canvas.Left="125"
+    Canvas.Top="354"
+    Content="PT9" />-->
                     <Label
                         Canvas.Left="9"
                         Canvas.Top="581"
@@ -2633,134 +2496,114 @@
                         Content="V17"
                         FontSize="10" />
 
-                    <TextBlock
-                        Canvas.Left="205"
-                        Canvas.Top="-46"
-                        FontFamily="Arial"
-                        FontSize="18"
-                        Text="PM1"
-                        Visibility="{Binding IsPM1Installed, Converter={StaticResource BoolVisibilityConverter}}" />
-                    <TextBlock
-                        Canvas.Left="500"
-                        Canvas.Top="-45"
-                        FontFamily="Arial"
-                        FontSize="18"
-                        Text="PM2"
-                        Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}" />
-                    <TextBlock
-                        Canvas.Left="116"
-                        Canvas.Top="235"
-                        FontFamily="Arial"
-                        FontSize="18"
-                        Text="UnLoad"
-                        Visibility="{Binding IsPreHeatInstalled, Converter={StaticResource BoolVisibilityConverter}}" />
-                    <TextBlock
-                        Canvas.Left="568"
-                        Canvas.Top="220"
-                        FontFamily="Arial"
-                        FontSize="18"
-                        RenderTransformOrigin="0.604,-1.095"
-                        Text="Buffer"
-                        Visibility="{Binding IsBufferInstalled, Converter={StaticResource BoolVisibilityConverter}}" />
-                    <TextBlock
-                        Canvas.Left="360"
-                        Canvas.Top="110"
-                        FontFamily="Arial"
-                        FontSize="18"
-                        Text="TM"
-                        Visibility="{Binding IsTMInstalled, Converter={StaticResource BoolVisibilityConverter}}" />
-                    <TextBlock
-                        Canvas.Left="351"
-                        Canvas.Top="380"
-                        FontFamily="Arial"
-                        FontSize="18"
-                        RenderTransformOrigin="4.531,3.688"
-                        Text="Load"
-                        Visibility="{Binding IsLLInstalled, Converter={StaticResource BoolVisibilityConverter}}" />
 
                     <!--<deviceControl:AITPressureMeter
-                        Canvas.Left="113"
-                        Canvas.Top="11"
-                        Width="90"
-                        Height="30"
-                        DeviceData="{Binding ForelinePressure}" />-->
+    Canvas.Left="113"
+    Canvas.Top="11"
+    Width="90"
+    Height="30"
+    DeviceData="{Binding ForelinePressure}" />-->
                     <!--<deviceControl:AITPressureMeter
-                        Canvas.Left="105"
-                        Canvas.Top="377"
-                        Width="90"
-                        Height="30"
-                        DeviceData="{Binding UnLoadPressure}" />-->
+    Canvas.Left="105"
+    Canvas.Top="377"
+    Width="90"
+    Height="30"
+    DeviceData="{Binding UnLoadPressure}" />-->
                     <deviceControl:AITPressureMeter
-                        Canvas.Left="416"
+                        Canvas.Left="464"
                         Canvas.Top="376"
                         Width="90"
                         Height="30"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         DeviceData="{Binding LLPressure}" />
                     <deviceControl:AITPressureMeter
-                        Canvas.Left="219"
+                        Canvas.Left="210"
                         Canvas.Top="376"
                         Width="90"
                         Height="30"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         DeviceData="{Binding TMPressure}" />
 
                     <!--<controlUI:AITPumpSIC
-                        Canvas.Left="344"
-                        Canvas.Top="586"
-                        DeviceData="{Binding PumpData2}"
-                        EnableControl="True" />-->
+    Canvas.Left="344"
+    Canvas.Top="586"
+    DeviceData="{Binding PumpData2}"
+    EnableControl="True" />-->
                     <controlUI:AITPumpSIC
-                        Canvas.Left="108"
+                        Canvas.Left="106"
                         Canvas.Top="586"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         DeviceData="{Binding PumpData}"
                         EnableControl="True" />
 
+                    <controlUI:AITPumpSIC
+                        Canvas.Left="245"
+                        Canvas.Top="586"
+                        DeviceData="{Binding PumpData2}"
+                        EnableControl="True" />
+
                     <deviceControl:AITGasValve
-                        Canvas.Left="512"
-                        Canvas.Top="90"
+                        Canvas.Left="464"
+                        Canvas.Top="114"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         DeviceData="{Binding TMPMBBanlance}"
                         EnableServiceControl="True"
                         IsEnabled="{Binding PM2TMValveIsEnable}"
                         ValveOpenOrientation="Vertical"
                         Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}" />
                     <deviceControl:AITGasValve
-                        Canvas.Left="210"
-                        Canvas.Top="90"
+                        Canvas.Left="171"
+                        Canvas.Top="113"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         DeviceData="{Binding TMPMABanlance}"
                         EnableServiceControl="True"
                         IsEnabled="{Binding PM1TMValveIsEnable}"
                         ValveOpenOrientation="Vertical"
                         Visibility="{Binding IsPM1Installed, Converter={StaticResource BoolVisibilityConverter}}" />
                     <!--<deviceControl:AITGasValve
-                        Canvas.Left="236"
-                        Canvas.Top="249"
-                        DeviceData="{Binding TMUnLoadBanlance}"
-                        EnableServiceControl="True"
-                        IsEnabled="False"
-                        ValveOpenOrientation="Horizontal" />-->
+    Canvas.Left="236"
+    Canvas.Top="249"
+    DeviceData="{Binding TMUnLoadBanlance}"
+    EnableServiceControl="True"
+    IsEnabled="False"
+    ValveOpenOrientation="Horizontal" />-->
                     <deviceControl:AITGasValve
-                        Canvas.Left="299"
+                        Canvas.Left="297"
                         Canvas.Top="442"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         DeviceData="{Binding TMFastRough}"
                         EnableServiceControl="True"
                         IsEnabled="{Binding TMValveIsEnable}"
                         ValveOpenOrientation="Vertical" />
                     <deviceControl:AITGasValve
-                        Canvas.Left="436"
+                        Canvas.Left="476"
                         Canvas.Top="444"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         DeviceData="{Binding LLSlowRough}"
                         EnableServiceControl="True"
                         IsEnabled="{Binding LoadValveIsEnable}"
                         ValveOpenOrientation="Vertical" />
                     <deviceControl:AITGasValve
-                        Canvas.Left="395"
+                        Canvas.Left="435"
                         Canvas.Top="444"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         DeviceData="{Binding LLFastRough}"
                         EnableServiceControl="True"
                         IsEnabled="{Binding LoadValveIsEnable}"
                         ValveOpenOrientation="Vertical" />
                     <deviceControl:AITGasValve
                         Canvas.Left="614"
-                        Canvas.Top="334"
+                        Canvas.Top="284"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Top"
                         DeviceData="{Binding LoadLockVent}"
                         EnableServiceControl="True"
                         IsEnabled="{Binding LoadValveIsEnable}"
@@ -2776,15 +2619,19 @@
 
 
                     <deviceControl:AITGasValve
-                        Canvas.Left="430"
-                        Canvas.Top="276"
+                        Canvas.Left="337"
+                        Canvas.Top="306"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         DeviceData="{Binding TMLoadBanlance}"
                         EnableServiceControl="True"
                         IsEnabled="{Binding LoadTMValveIsEnable}"
                         ValveOpenOrientation="Vertical" />
                     <deviceControl:AITGasValve
-                        Canvas.Left="340"
+                        Canvas.Left="338"
                         Canvas.Top="442"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
                         DeviceData="{Binding TMSlowRough}"
                         EnableServiceControl="True"
                         IsEnabled="{Binding TMValveIsEnable}"
@@ -2796,25 +2643,25 @@
                         EnableServiceControl="True"
                         IsEnabled="{Binding TMValveIsEnable}" />
                     <!--<deviceControl:AITGasValve
-                        Canvas.Left="449"
-                        Canvas.Top="-125"
-                        DeviceData="{Binding UnLoadVent}"
-                        EnableServiceControl="True"
-                        IsEnabled="False" />-->
+    Canvas.Left="449"
+    Canvas.Top="-125"
+    DeviceData="{Binding UnLoadVent}"
+    EnableServiceControl="True"
+    IsEnabled="False" />-->
                     <!--<deviceControl:AITGasValve
-                        Canvas.Left="225"
-                        Canvas.Top="442"
-                        DeviceData="{Binding UnLoadSlowRough}"
-                        EnableServiceControl="True"
-                       IsEnabled="False"
-                        ValveOpenOrientation="Vertical" />-->
+    Canvas.Left="225"
+    Canvas.Top="442"
+    DeviceData="{Binding UnLoadSlowRough}"
+    EnableServiceControl="True"
+   IsEnabled="False"
+    ValveOpenOrientation="Vertical" />-->
                     <!--<deviceControl:AITGasValve
-                        Canvas.Left="184"
-                        Canvas.Top="441"
-                        DeviceData="{Binding UnLoadFastRough}"
-                        EnableServiceControl="True"
-                        IsEnabled="False"
-                        ValveOpenOrientation="Vertical" />-->
+    Canvas.Left="184"
+    Canvas.Top="441"
+    DeviceData="{Binding UnLoadFastRough}"
+    EnableServiceControl="True"
+    IsEnabled="False"
+    ValveOpenOrientation="Vertical" />-->
 
                     <controlUI:AnalogControl2
                         Canvas.Left="620"
@@ -2828,9 +2675,14 @@
                         Canvas.Left="576"
                         Canvas.Top="33"
                         IsEnabled="{Binding BufferEnableWaferClick}"
-                        UnitData="{Binding Buffer}" />
+                        UnitData="{Binding BufferSlotInfors}" />
                 </Canvas>
 
+
+
+
+
+
             </Canvas>
 
             <StackPanel
@@ -2885,8 +2737,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="0,0,0,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -2969,8 +2821,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="0,0,0,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -3015,17 +2867,17 @@
                             </Button>
 
                             <TextBlock
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 Width="97"
                                 Margin="47,0,0,0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 FontFamily="Arial"
                                 FontSize="12"
                                 Foreground="{DynamicResource FG_Black}"
                                 TextAlignment="Left"
                                 TextWrapping="Wrap">
-                                <Run Text="{lex:Loc ID_TXT_PurgeLoop}" FontSize="12"/><Run Text="{Binding TMPurgeLoop, StringFormat=0.00 ,Mode=OneWay}" FontSize="12"/>
+                                <Run FontSize="12" Text="{lex:Loc ID_TXT_PurgeLoop}" /><Run FontSize="12" Text="{Binding TMPurgeLoop, StringFormat=0.00, Mode=OneWay}" />
                             </TextBlock>
                         </StackPanel>
 
@@ -3123,8 +2975,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -3201,8 +3053,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -3312,10 +3164,10 @@
                                 </i:Interaction.Triggers>
                             </Button>
                             <Button
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 Width="120"
                                 Height="25"
                                 Margin="10,0"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 Content="{lex:Loc ID_BTN_ServoPressure_Content}"
                                 IsEnabled="{Binding IsTMEnableManualOperation}">
                                 <i:Interaction.Triggers>
@@ -3379,8 +3231,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="0,0,0,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -3464,8 +3316,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="0,0,0,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_terms"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -3590,8 +3442,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -3622,9 +3474,9 @@
                         BorderThickness="1,0,1,1">
                         <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                             <Label
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 HorizontalContentAlignment="Center"
                                 VerticalContentAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 Background="{DynamicResource Table_BG_Title}"
                                 BorderBrush="{DynamicResource Table_BD}"
                                 Content="{lex:Loc ID_TXT_RemainTime}"
@@ -3650,8 +3502,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -3682,9 +3534,9 @@
                         BorderThickness="1,0,1,1">
                         <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                             <Label
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 HorizontalContentAlignment="Center"
                                 VerticalContentAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 Background="{DynamicResource Table_BG_Title}"
                                 BorderBrush="{DynamicResource Table_BD}"
                                 Content="{lex:Loc ID_TXT_RemainTime}"
@@ -3710,8 +3562,8 @@
                         BorderBrush="{DynamicResource Table_BD}"
                         BorderThickness="1,0,1,1">
                         <TextBlock
-                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             VerticalAlignment="Center"
+                            lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                             FontFamily="Arial"
                             FontSize="12"
                             Foreground="{DynamicResource FG_Black}"
@@ -3742,9 +3594,9 @@
                         BorderThickness="1,0,1,1">
                         <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                             <Label
-                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 HorizontalContentAlignment="Center"
                                 VerticalContentAlignment="Center"
+                                lex:ResxLocalizationProvider.DefaultDictionary="lang_tmview"
                                 Background="{DynamicResource Table_BG_Title}"
                                 BorderBrush="{DynamicResource Table_BD}"
                                 Content="{lex:Loc ID_TXT_RemainTime}"
diff --git a/SicUI/Models/Operations/Overviews/OverViewView.xaml b/SicUI/Models/Operations/Overviews/OverViewView.xaml
index 098a9e9..ce61e07 100644
--- a/SicUI/Models/Operations/Overviews/OverViewView.xaml
+++ b/SicUI/Models/Operations/Overviews/OverViewView.xaml
@@ -89,7 +89,7 @@
                 Canvas.Left="250"
                 Canvas.Top="-80"
                 Width="600"
-                Height="600" />
+                Height="620" />
 
             <StackPanel Canvas.Left="456" Canvas.Top="637">
                 <Grid>