diff --git a/SicUI/Models/Operations/Overviews/OverViewView.xaml b/SicUI/Models/Operations/Overviews/OverViewView.xaml
index a9cc263..055013c 100644
--- a/SicUI/Models/Operations/Overviews/OverViewView.xaml
+++ b/SicUI/Models/Operations/Overviews/OverViewView.xaml
@@ -342,125 +342,6 @@
                         IsEnabled="{Binding IsEnableJobCassAR}"
                         WAInfo="{Binding CassARWaferAssociation}" />
                 </TabItem>
-                <TabItem Header="Tray">
-                    <StackPanel Orientation="Vertical">
-                        <unitControls:FOUPFrontView
-                            Margin="0,0,0,0"
-                            UnitData="{Binding CassBL}"
-                            Visibility="{Binding IsLP1Installed, Converter={StaticResource BoolVisibilityConverter}}" />
-                        <StackPanel Orientation="Horizontal">
-                            <TextBox
-                                Width="50"
-                                Margin="80,0,0,0"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="Center"
-                                FontFamily="Arial"
-                                FontSize="12"
-                                Foreground="{DynamicResource FG_Black}"
-                                MaxLength="2">
-                                <TextBox.Text>
-                                    <Binding Path="CassBL1" UpdateSourceTrigger="PropertyChanged">
-                                        <Binding.ValidationRules>
-                                            <vr:CassAWaferAmountValidationRule Max="8" Min="1" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </TextBox.Text>
-                            </TextBox>
-
-                            <Label
-                                Width="20"
-                                Height="25"
-                                HorizontalAlignment="Center"
-                                VerticalAlignment="Center"
-                                Content="--"
-                                FontSize="13"
-                                IsEnabled="True" />
-                            <TextBox
-                                Width="50"
-                                VerticalAlignment="Center"
-                                HorizontalContentAlignment="Center"
-                                FontFamily="Arial"
-                                FontSize="12"
-                                Foreground="{DynamicResource FG_Black}"
-                                MaxLength="2">
-                                <TextBox.Text>
-                                    <Binding Path="CassBL2" UpdateSourceTrigger="PropertyChanged">
-                                        <Binding.ValidationRules>
-                                            <vr:CassAWaferAmountValidationRule Max="8" Min="1" />
-                                        </Binding.ValidationRules>
-                                    </Binding>
-                                </TextBox.Text>
-                            </TextBox>
-                            <!--</Border>-->
-                        </StackPanel>
-
-                        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition />
-                                    <ColumnDefinition />
-                                </Grid.ColumnDefinitions>
-
-                                <Button
-                                    Width="62"
-                                    Height="24"
-                                    Margin="1,2"
-                                    Content="Create"
-                                    FontSize="12">
-                                    <i:Interaction.Triggers>
-                                        <i:EventTrigger EventName="Click">
-                                            <cal:ActionMessage MethodName="CreateWafer">
-                                                <cal:Parameter Value="CassBL" />
-                                                <cal:Parameter Value="{Binding CassBL1}" />
-                                                <cal:Parameter Value="{Binding CassBL2}" />
-                                            </cal:ActionMessage>
-                                        </i:EventTrigger>
-                                    </i:Interaction.Triggers>
-                                </Button>
-                                <Button
-                                    Grid.Column="1"
-                                    Width="62"
-                                    Height="24"
-                                    Margin="0,2"
-                                    Content="Delete"
-                                    FontSize="12">
-                                    <i:Interaction.Triggers>
-                                        <i:EventTrigger EventName="Click">
-                                            <cal:ActionMessage MethodName="DeleteWafer">
-                                                <cal:Parameter Value="CassBL" />
-                                                <cal:Parameter Value="{Binding CassBL1}" />
-                                                <cal:Parameter Value="{Binding CassBL2}" />
-                                            </cal:ActionMessage>
-                                        </i:EventTrigger>
-                                    </i:Interaction.Triggers>
-                                </Button>
-
-                                <Button
-                                    Grid.Row="1"
-                                    Width="62"
-                                    Height="24"
-                                    Margin="0,2"
-                                    Content="Map"
-                                    FontSize="12">
-                                    <i:Interaction.Triggers>
-                                        <i:EventTrigger EventName="Click">
-                                            <cal:ActionMessage MethodName="MapTray">
-                                                <cal:Parameter Value="CassBL" />
-                                            </cal:ActionMessage>
-                                        </i:EventTrigger>
-                                    </i:Interaction.Triggers>
-                                </Button>
-
-                            </Grid>
-                        </StackPanel>
-                    </StackPanel>
-                </TabItem>
             </TabControl>
         </Canvas>
 
@@ -473,14 +354,14 @@
 
             <parts:M2C4EFEMView
                 x:Name="system"
-                Canvas.Left="236"
+                Canvas.Left="284"
                 Canvas.Top="2"
                 Width="770"
                 Height="698" />
 
             <Grid
                 x:Name="PM1_Info"
-                Canvas.Left="87"
+                Canvas.Left="75"
                 Canvas.Top="30"
                 Visibility="{Binding IsPM1Installed, Converter={StaticResource BoolVisibilityConverter}}">
                 <Grid.ColumnDefinitions>
@@ -678,8 +559,8 @@
 
             <Grid
                 x:Name="PM2_Info"
-                Canvas.Left="962"
-                Canvas.Top="30"
+                Canvas.Left="75"
+                Canvas.Top="226"
                 Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="110" />
@@ -850,13 +731,13 @@
             <Grid
                 x:Name="Buffer_Info"
                 Canvas.Left="962"
-                Canvas.Top="320">
+                Canvas.Top="500">
                 <unitControls:FOUPFrontView Margin="0,2,0,-2" UnitData="{Binding Buffer}" />
             </Grid>
             <Grid
                 x:Name="RemainTime"
                 Canvas.Left="1100"
-                Canvas.Top="320"
+                Canvas.Top="500"
                 Visibility="{Binding IsBufferInstalled, Converter={StaticResource BoolVisibilityConverter}}">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="110" />
@@ -922,8 +803,8 @@
 
             <Grid
                 x:Name="UnLoad_Info"
-                Canvas.Left="87"
-                Canvas.Top="224"
+                Canvas.Left="75"
+                Canvas.Top="417"
                 Visibility="{Binding IsUnLoadInstalled, Converter={StaticResource BoolVisibilityConverter}}">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="110" />
@@ -1081,7 +962,7 @@
             <Grid
                 x:Name="Load_Info"
                 Canvas.Left="962"
-                Canvas.Top="450"
+                Canvas.Top="660"
                 Visibility="{Binding IsLoadInstalled, Converter={StaticResource BoolVisibilityConverter}}">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="110" />
@@ -1207,10 +1088,151 @@
 
             </Grid>
 
+            <!-- Tray Panel -->
+            <Grid
+                Canvas.Left="962"
+                Canvas.Top="20">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="24" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <Label
+                    Grid.Row="0"
+                    Grid.ColumnSpan="2"
+                    HorizontalContentAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    Content="Tray"
+                    Style="{DynamicResource Table_TitleStyle}" />
+
+                <Border
+                    Grid.Row="1"
+                    Padding="58 5"
+                    Background="{DynamicResource MainFrame_BG}"
+                    BorderBrush="{DynamicResource MainFrame_BD}">
+                    <StackPanel Orientation="Vertical">
+                        <unitControls:FOUPFrontView
+                            Margin="0,0,0,0"
+                            UnitData="{Binding CassBL}"
+                            Visibility="{Binding IsLP1Installed, Converter={StaticResource BoolVisibilityConverter}}" />
+                        <StackPanel Orientation="Horizontal">
+                            <TextBox
+                                Width="50"
+                                Margin="5,0,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                FontFamily="Arial"
+                                FontSize="12"
+                                Foreground="{DynamicResource FG_Black}"
+                                MaxLength="2">
+                                <TextBox.Text>
+                                    <Binding Path="CassBL1" UpdateSourceTrigger="PropertyChanged">
+                                        <Binding.ValidationRules>
+                                            <vr:CassAWaferAmountValidationRule Max="8" Min="1" />
+                                        </Binding.ValidationRules>
+                                    </Binding>
+                                </TextBox.Text>
+                            </TextBox>
+
+                            <Label
+                                Width="20"
+                                Height="25"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Content="--"
+                                FontSize="13"
+                                IsEnabled="True" />
+                            <TextBox
+                                Width="50"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="Center"
+                                FontFamily="Arial"
+                                FontSize="12"
+                                Foreground="{DynamicResource FG_Black}"
+                                MaxLength="2">
+                                <TextBox.Text>
+                                    <Binding Path="CassBL2" UpdateSourceTrigger="PropertyChanged">
+                                        <Binding.ValidationRules>
+                                            <vr:CassAWaferAmountValidationRule Max="8" Min="1" />
+                                        </Binding.ValidationRules>
+                                    </Binding>
+                                </TextBox.Text>
+                            </TextBox>
+                            <!--</Border>-->
+                        </StackPanel>
+
+                        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <Button
+                                    Width="62"
+                                    Height="24"
+                                    Margin="1,2"
+                                    Content="Create"
+                                    FontSize="12">
+                                    <i:Interaction.Triggers>
+                                        <i:EventTrigger EventName="Click">
+                                            <cal:ActionMessage MethodName="CreateWafer">
+                                                <cal:Parameter Value="CassBL" />
+                                                <cal:Parameter Value="{Binding CassBL1}" />
+                                                <cal:Parameter Value="{Binding CassBL2}" />
+                                            </cal:ActionMessage>
+                                        </i:EventTrigger>
+                                    </i:Interaction.Triggers>
+                                </Button>
+                                <Button
+                                    Grid.Column="1"
+                                    Width="62"
+                                    Height="24"
+                                    Margin="0,2"
+                                    Content="Delete"
+                                    FontSize="12">
+                                    <i:Interaction.Triggers>
+                                        <i:EventTrigger EventName="Click">
+                                            <cal:ActionMessage MethodName="DeleteWafer">
+                                                <cal:Parameter Value="CassBL" />
+                                                <cal:Parameter Value="{Binding CassBL1}" />
+                                                <cal:Parameter Value="{Binding CassBL2}" />
+                                            </cal:ActionMessage>
+                                        </i:EventTrigger>
+                                    </i:Interaction.Triggers>
+                                </Button>
+
+                                <Button
+                                    Grid.Row="1"
+                                    Width="62"
+                                    Height="24"
+                                    Margin="0,2"
+                                    Content="Map"
+                                    FontSize="12">
+                                    <i:Interaction.Triggers>
+                                        <i:EventTrigger EventName="Click">
+                                            <cal:ActionMessage MethodName="MapTray">
+                                                <cal:Parameter Value="CassBL" />
+                                            </cal:ActionMessage>
+                                        </i:EventTrigger>
+                                    </i:Interaction.Triggers>
+                                </Button>
+
+                            </Grid>
+                        </StackPanel>
+                    </StackPanel>
+                </Border>
+            </Grid>
+            
             <Grid
                 x:Name="BufferInfo"
                 Canvas.Left="962"
-                Canvas.Top="200"
+                Canvas.Top="400"
                 Visibility="{Binding IsBufferInstalled, Converter={StaticResource BoolVisibilityConverter}}">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="110" />
@@ -1287,36 +1309,36 @@
                 Width="100"
                 Height="200">
                 <TextBlock
-                    Canvas.Left="395"
-                    Canvas.Top="159"
+                    Canvas.Left="493"
+                    Canvas.Top="139"
                     FontFamily="Arial"
                     FontSize="18"
                     Text="PM1"
                     Visibility="{Binding IsPM1Installed, Converter={StaticResource BoolVisibilityConverter}}" />
                 <TextBlock
                     Canvas.Left="786"
-                    Canvas.Top="159"
+                    Canvas.Top="135"
                     FontFamily="Arial"
                     FontSize="18"
                     Text="PM2"
                     Visibility="{Binding IsPM2Installed, Converter={StaticResource BoolVisibilityConverter}}" />
                 <TextBlock
-                    Canvas.Left="780"
+                    Canvas.Left="816"
                     Canvas.Top="334"
                     FontFamily="Arial"
                     FontSize="18"
                     Text="Buffer"
                     Visibility="{Binding IsPreHeatInstalled, Converter={StaticResource BoolVisibilityConverter}}" />
                 <TextBlock
-                    Canvas.Left="390"
-                    Canvas.Top="325"
+                    Canvas.Left="454"
+                    Canvas.Top="315"
                     FontFamily="Arial"
                     FontSize="18"
                     Text="UnLoad"
                     Visibility="{Binding IsBufferInstalled, Converter={StaticResource BoolVisibilityConverter}}" />
                 <TextBlock
-                    Canvas.Left="252"
-                    Canvas.Top="492"
+                    Canvas.Left="375"
+                    Canvas.Top="407"
                     FontFamily="Arial"
                     FontSize="18"
                     Text="Aligner"
@@ -1338,28 +1360,28 @@
                     TextAlignment="Center"
                     Visibility="{Binding IsTMInstalled, Converter={StaticResource BoolVisibilityConverter}}" />
                 <TextBlock
-                    Canvas.Left="353"
+                    Canvas.Left="400"
                     Canvas.Top="665"
                     FontFamily="Arial"
                     FontSize="18"
                     Text="CassAL"
                     Visibility="{Binding IsBufferInstalled, Converter={StaticResource BoolVisibilityConverter}}" />
                 <TextBlock
-                    Canvas.Left="573"
+                    Canvas.Left="615"
                     Canvas.Top="665"
                     FontFamily="Arial"
                     FontSize="18"
                     Text="CassAR"
                     Visibility="{Binding IsBufferInstalled, Converter={StaticResource BoolVisibilityConverter}}" />
                 <TextBlock
-                    Canvas.Left="780"
-                    Canvas.Top="665"
+                    Canvas.Left="823"
+                    Canvas.Top="646"
                     FontFamily="Arial"
                     FontSize="18"
                     Text="CassB"
                     Visibility="{Binding IsBufferInstalled, Converter={StaticResource BoolVisibilityConverter}}" />
                 <TextBlock
-                    Canvas.Left="595"
+                    Canvas.Left="643"
                     Canvas.Top="553"
                     FontFamily="Arial"
                     FontSize="18"