diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml
index e7753cba..7d983942 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdBTLPartListV.xaml
@@ -247,7 +247,7 @@
             </DataGridTextColumn.Header>-->
             <DataGridTextColumn.HeaderTemplate>
                <DataTemplate>
-                  <TextBlock Text="{Binding DataContext.ShortCNT_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
+                  <TextBlock Text="QTY"
                              ToolTip="{Binding DataContext.CNT_Msg,RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"/>
                </DataTemplate>
             </DataGridTextColumn.HeaderTemplate>
@@ -430,16 +430,16 @@
             <ListBox ItemsSource="{Binding BTLFeatureVMList}"
                      SelectedItem="{Binding SelBTLFeatureVM, UpdateSourceTrigger=PropertyChanged}"
                      PreviewMouseWheel="ListBox_PreviewMouseWheel"
-                     SelectionMode="Single" 
-                     IsSynchronizedWithCurrentItem="True">
+                     Width="920"
+                     Style="{StaticResource BTL_ListBox}">
                <ListBox.ItemTemplate>
                   <DataTemplate>
                      <Grid>
                         <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="1*"/>
-                           <ColumnDefinition Width="1*"/>
                            <ColumnDefinition Width="Auto"/>
-                           <ColumnDefinition Width="1*"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
                         </Grid.ColumnDefinitions>
                         <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
                                   VerticalAlignment="Center"
@@ -470,7 +470,7 @@
                            </Grid>
                         </Grid>
                         <TextBlock Grid.Column="3"
-                                   Text="{Binding sName}" 
+                                   Text="{Binding sDesc}" 
                                    Margin="2.5,0,10,0"
                                    Style="{StaticResource OnlyProd_TextBlock}"/>
                      </Grid>
diff --git a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdRawPartListV.xaml b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdRawPartListV.xaml
index bf18cf57..96a262ff 100644
--- a/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdRawPartListV.xaml
+++ b/EgtBEAMWALL.Optimizer/ItemParamList/OnlyProdRawPartListV.xaml
@@ -299,7 +299,7 @@
                                             CanUserDeleteRows="False"
                                             CanUserSortColumns="False"
                                             SelectionMode="Single"
-                                            Margin="20,0,0,5"
+                                            Margin="15,0,0,5"
                                             BeginningEdit="PartInRawPartList_BeginningEdit"
                                             BindingColumns="{Binding DataContext.PartInRawPartColumns, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"
                                             ColumnHeaderBackground="{StaticResource BeamWall_White}"
@@ -311,6 +311,7 @@
                                             GridLinesVisibility="None"
                                             BorderThickness="0"
                                             ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                                            Width="860"
                                             CellStyle="{StaticResource CellDataGrid_CustomHighLight}"
                                             Style="{StaticResource DataGrid_OnlyProd}">
                   <DataGrid.RowStyle>
@@ -492,9 +493,7 @@
                         </DataGridTextColumn.CellStyle>
                         <DataGridTextColumn.EditingElementStyle>
                            <Style TargetType="{x:Type TextBox}">
-                              <Setter Property="FontWeight" Value="Bold" />
-                              <Setter Property="Foreground" Value="{StaticResource BeamWall_White}" />
-                              <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}" />
+                              <Setter Property="Foreground" Value="Blue" />
                            </Style>
                         </DataGridTextColumn.EditingElementStyle>
                      </DataGridTextColumn>
diff --git a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
index f50d155c..1ccb4cfe 100644
--- a/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Optimizer/Utility/Dictionary.xaml
@@ -3361,6 +3361,43 @@
       </Style.Resources>
    </Style>
 
+   <Style x:Key="BTL_ListBox" TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Type ListBox}}">
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="HorizontalAlignment" Value="Left"/>
+      <Setter Property="SelectionMode" Value="Single"/>
+      <Setter Property="IsSynchronizedWithCurrentItem" Value="True"/>
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource OnlyProd_ScrollBar}"/>
+         <Style TargetType="{x:Type ListBoxItem}">
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="ListBoxItem">
+                     <Border Background="{TemplateBinding Background}"
+                             BorderBrush="Transparent"
+                             BorderThickness="1">
+                        <ContentPresenter />
+                     </Border>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+               <Trigger Property="IsSelected" Value="True">
+                  <Setter Property="Background" Value="{StaticResource BeamWall_FountainBlue}"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
+                  <Setter Property="FontWeight" Value="Bold"/>
+                  <Setter Property="FontSize" Value="12"/>
+               </Trigger>
+               <Trigger Property="IsSelected" Value="False">
+                  <Setter Property="Background" Value="Transparent"/>
+                  <Setter Property="Foreground" Value="{StaticResource BeamWall_Corduroy}"/>
+                  <Setter Property="FontWeight" Value="SemiBold"/>
+                  <Setter Property="FontSize" Value="12"/>
+               </Trigger>
+            </Style.Triggers>
+         </Style>
+      </Style.Resources>
+   </Style>
+
    <!--#endregion ListBox-->
 
    <!--#region WrapPanel-->
@@ -3414,7 +3451,7 @@
    <!--#region Ellipse-->
 
    <Style x:Key="CALC_ROT_Ellipse" TargetType="{x:Type Ellipse}">
-      <Setter Property="Fill" Value="{StaticResource Omag_Red}"/>
+      <Setter Property="Fill" Value="{StaticResource Omag_Green}"/>
       <Setter Property="Width" Value="5"/>
       <Setter Property="Height" Value="5"/>
       <Setter Property="HorizontalAlignment" Value="Center"/>