diff --git a/AboutBoxWindow/AboutBoxView.xaml b/AboutBoxWindow/AboutBoxView.xaml
index cf409be..19d0888 100644
--- a/AboutBoxWindow/AboutBoxView.xaml
+++ b/AboutBoxWindow/AboutBoxView.xaml
@@ -1,8 +1,8 @@
 <Window x:Class="AboutBoxWndV"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
-    ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="AboutBox" Height="400" Width="360" WindowStyle="None" ResizeMode="NoResize"
+        ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
 
    <Border BorderThickness="2" BorderBrush="LightBlue">
       <Grid >
@@ -35,15 +35,15 @@
             </Border>
          </Grid>
          <TextBlock Name="DescriptionLbl" Grid.Column="1" Grid.Row="3" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="18" />
+                    VerticalAlignment="Center" FontSize="18" />
          <TextBlock Name="VersionLbl" Grid.Column="1" Grid.Row="4" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="18"/>
+                    VerticalAlignment="Center" FontSize="18"/>
          <TextBlock Name="CopyrightLbl" Grid.Column="1" Grid.Row="5" HorizontalAlignment="Center"
-               VerticalAlignment="Center" FontSize="12" />
+                    VerticalAlignment="Center" FontSize="12" />
          <TextBox Name="InfoLbl" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Stretch"
-               VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
+                  VerticalAlignment="Stretch" FontSize="12" IsReadOnly="True" TextWrapping="Wrap"/>
          <Button Name="ExitBtn" Grid.Column="1" Grid.Row="8" IsCancel="True"
-               Margin="100,0"/>
+                 Margin="100,0"/>
 
       </Grid>
 
diff --git a/DrawPanel/DrawPanelV.xaml b/DrawPanel/DrawPanelV.xaml
index e49453e..82b8183 100644
--- a/DrawPanel/DrawPanelV.xaml
+++ b/DrawPanel/DrawPanelV.xaml
@@ -9,82 +9,82 @@
 
    <StackPanel Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <Expander Name="Draw2D" Style="{StaticResource ExpanderStyle}" Grid.Row="0"
-         IsExpanded="{Binding Draw2DIsExpanded}">
+                IsExpanded="{Binding Draw2DIsExpanded}">
          <Expander.Header>
             <TextBlock Text="{Binding Draw2DMsg}"/>
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding PointToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding PointCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding PointCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Point.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Line2PToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Line2PCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Line2PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Line2P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding LinePDLToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding LinePDLCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/LinePDL.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ArcCSEToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ArcCSECommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/ArcCSE.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Arc3PToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Arc3PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Arc3P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ArcPDPToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ArcPDPCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/ArcPDP.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding CirclePDToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding CircleCPCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/CircleCP.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Circle3PToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Circle3PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Circle3P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding CircleCDToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding CircleCDCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/CircleCD.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Rectangle2PToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Rectangle2PCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Rectangle2P.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding PolygonToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding PolygonCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Polygon.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding PolygonSideToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding PolygonSideCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/PolygonSide.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding TextToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding TextCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/Text.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding LinearDimensionToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding LinearDimensionCommand}" IsEnabled="{Binding bLayerOk}">
                <Image Source="/Resources/DrawPanel/LinearDimension.png" Stretch="Uniform"/>
             </Button>
-            </UniformGrid>
+         </UniformGrid>
       </Expander>
       <Expander Name="Draw3D" Style="{StaticResource ExpanderStyle}" Grid.Row="1"
                 Visibility="{Binding Draw3DVisibility}" IsExpanded="{Binding Draw3DIsExpanded}">
@@ -93,88 +93,88 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding PlaneToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding PlaneCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding PlaneCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Plane.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtrudeToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExtrudeCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Extrude.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding RevolveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding RevolveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Revolve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ScrewToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Screw.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SweptToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Swept.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding RuledToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Ruled.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SolidAddSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding SolidAddSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SolidAddSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SolidSubtractSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SolidSubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding SolidSubtractSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SolidSubtractSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SolidIntersectSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding SolidIntersectSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SolidIntersectSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding IntersectSurfSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding IntersectSurfSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/IntersectSurfSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtractLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExtractLoopsCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractLoops.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtractFacetLoopsToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExtractFacetLoopsCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractFacetLoops.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExplodeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExplodeSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExplodeSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExplodeSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtractSurfFacetToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExtractSurfFacetCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtractSurfFacet.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding MergeSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding MergeSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/MergeSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding InvertSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding InvertSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/InvertSurf.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ApproxSurfToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ApproxSurfCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ApproxSurf.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>
@@ -185,120 +185,120 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding DeleteToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding DeleteCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeLayerToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ChangeLayerCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeLayer.png" Stretch="Uniform"/>
             </Button>
             <Button Style="{StaticResource DrawPanelButton}"
                     Visibility="Hidden"/>
             <Button ToolTip="{Binding ChangeColorToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ChangeColorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeColor.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeAlphaToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ChangeAlphaCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeColorAlpha.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ResetColorToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ResetColorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/RemoveColor.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding InvertCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding InvertCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/InvertCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChangeStartToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ChangeStartCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ChangeStart.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ThickCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True" 
-               Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True" 
+                    Command="{Binding SetCurveThCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ThickCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExtendCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExtendCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExtendCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding BreakCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding BreakCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/BreakCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding SplitCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding SplitCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/SplitCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ExplodeCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ExplodeCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ExplodeCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding JoinCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding JoinCurveCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/JoinCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding OffsetToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding OffsetCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Offset.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding FilletToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding FilletCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Fillet.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ChamferToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ChamferCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Chamfer.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ArcFlipToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ArcFlipCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ArcFlipCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ArcFlip.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ModifyCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ModifyCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyCurve.png" Stretch="Uniform"/>
-             </Button>
-             <Button ToolTip="{Binding AddPointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                ToolTipService.ShowOnDisabled="True"
-                Command="{Binding AddPointCurveCommand}" IsEnabled="{Binding bSelOk}">
-                <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
-             </Button>
-             <Button ToolTip="{Binding RemovePointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-                ToolTipService.ShowOnDisabled="True"
-                Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}">
-                <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
-             </Button>
+            </Button>
+            <Button ToolTip="{Binding AddPointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding AddPointCurveCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/AddPointCurve.png" Stretch="Uniform"/>
+            </Button>
+            <Button ToolTip="{Binding RemovePointCurveToolTip}" Style="{StaticResource DrawPanelButton}"
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding RemovePointCurveCommand}" IsEnabled="{Binding bSelOk}">
+               <Image Source="/Resources/DrawPanel/RemovePointCurve.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding ApproxCurveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ApproxCurveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ApproxCurveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ApproxCurve.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ModifyArcRadiusToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ModifyArcRadiusCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyArcRadius.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ModifyTextToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ModifyTextCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/ModifyText.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>
@@ -309,8 +309,8 @@
          </Expander.Header>
          <UniformGrid Columns="3">
             <Button ToolTip="{Binding MoveToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding MoveCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Move.png" Stretch="Uniform"/>
             </Button>
             <Button Style="{StaticResource DrawPanelButton}"
@@ -318,33 +318,33 @@
             <Button Style="{StaticResource DrawPanelButton}"
                     Visibility="Hidden"/>
             <Button ToolTip="{Binding RotateToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding RotateCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Rotate.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding MirrorToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding MirrorCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Mirror.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding ScaleToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding ScaleCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Scale.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Rotate3DToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Rotate3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Rotate3D.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Mirror3DToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Mirror3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Mirror3D.png" Stretch="Uniform"/>
             </Button>
             <Button ToolTip="{Binding Scale3DToolTip}" Style="{StaticResource DrawPanelButton}"
-               ToolTipService.ShowOnDisabled="True"
-               Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
+                    ToolTipService.ShowOnDisabled="True"
+                    Command="{Binding Scale3DCommand}" IsEnabled="{Binding bSelOk}">
                <Image Source="/Resources/DrawPanel/Scale3D.png" Stretch="Uniform"/>
             </Button>
          </UniformGrid>
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 3e6c49c..00c1bd3 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -1005,6 +1005,9 @@
   <ItemGroup>
     <Resource Include="Resources\Note\+.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\Note\-.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe
diff --git a/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml b/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml
index 833abd1..78f9006 100644
--- a/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml
+++ b/EstimationsDetailsWnd/EstimationsDetailsWndV.xaml
@@ -1,14 +1,14 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="EstimationsDetailsWndV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding TitleMsg}"
-   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
-   Width="300" Height="300"
-   IsResizable="True"
-   IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False">
-   
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding TitleMsg}"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32"
+                            Width="300" Height="300"
+                            IsResizable="True"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False">
+
    <WebBrowser Name="EstimationsWebBrowser" Margin="10"/>
-   
+
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/ExecutePanel/ExecutePanelV.xaml b/ExecutePanel/ExecutePanelV.xaml
index d914077..c41b52b 100644
--- a/ExecutePanel/ExecutePanelV.xaml
+++ b/ExecutePanel/ExecutePanelV.xaml
@@ -6,7 +6,7 @@
 
    <StackPanel Orientation="Horizontal">
       <Button Command="{Binding ExecCommand}" ToolTip="{Binding ExecToolTip}"
-         Style="{StaticResource GridViewPanelButton}" ContextMenuService.Placement="Bottom">
+              Style="{StaticResource GridViewPanelButton}" ContextMenuService.Placement="Bottom">
          <Button.ContextMenu>
             <ContextMenu ItemsSource="{Binding MruScriptNames}" ItemContainerStyle="{StaticResource MruScriptItem}">
             </ContextMenu>
diff --git a/GridPanel/GridPanelV.xaml b/GridPanel/GridPanelV.xaml
index 7fb3e1e..c092863 100644
--- a/GridPanel/GridPanelV.xaml
+++ b/GridPanel/GridPanelV.xaml
@@ -1,6 +1,6 @@
 <UserControl x:Class="GridPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
    <StackPanel Background="Transparent" Orientation="Horizontal">
       <Button Command="{Binding CPlaneTopCommand}" ToolTip="{Binding CPlaneTopToolTip}" Style="{StaticResource GridViewPanelButton}">
diff --git a/InstrumentPanel/InstrumentPanelV.xaml b/InstrumentPanel/InstrumentPanelV.xaml
index a121aaa..506bd9a 100644
--- a/InstrumentPanel/InstrumentPanelV.xaml
+++ b/InstrumentPanel/InstrumentPanelV.xaml
@@ -1,17 +1,17 @@
 <EgtFloating:EgtFloatingPanel x:Class="InstrumentPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False"
-   TitleBarOrientation="Horizontal">
+                              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                              xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+                              IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False"
+                              TitleBarOrientation="Horizontal">
 
    <!--<StackPanel Background="Transparent" Orientation="Horizontal">-->
-      <ToggleButton ToolTip="{Binding AnalyzeToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding AnalyzeIsChecked}" IsEnabled="{Binding AnalyzeIsEnabled}">
-         <Image Source="/Resources/GridViewPanel/Analyze.png" Stretch="Uniform"/>
-      </ToggleButton>
-      <ToggleButton ToolTip="{Binding GetDistToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding GetDistIsChecked}">
-         <Image Source="/Resources/GridViewPanel/GetDist.png" Stretch="Uniform"/>
-      </ToggleButton>
+   <ToggleButton ToolTip="{Binding AnalyzeToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding AnalyzeIsChecked}" IsEnabled="{Binding AnalyzeIsEnabled}">
+      <Image Source="/Resources/GridViewPanel/Analyze.png" Stretch="Uniform"/>
+   </ToggleButton>
+   <ToggleButton ToolTip="{Binding GetDistToolTip}" Style="{StaticResource GridViewPanelToggleButton}" IsChecked="{Binding GetDistIsChecked}">
+      <Image Source="/Resources/GridViewPanel/GetDist.png" Stretch="Uniform"/>
+   </ToggleButton>
    <!--</StackPanel>-->
 
 </EgtFloating:EgtFloatingPanel>
diff --git a/MachOptionsWindow/MachOptionV.xaml b/MachOptionsWindow/MachOptionV.xaml
index 3ae73f4..77e95c7 100644
--- a/MachOptionsWindow/MachOptionV.xaml
+++ b/MachOptionsWindow/MachOptionV.xaml
@@ -1,14 +1,14 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MachOptionV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:local="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
-   TitleBarBrush="{StaticResource EgaltechBlue1}"
-   BorderBrush="{StaticResource EgaltechBlue1}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
-   IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-   CloseCommand="{Binding CloseMachOptionsCommand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" SizeToContent="WidthAndHeight">
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:local="clr-namespace:EgtCAM5"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}"
+                            BorderBrush="{StaticResource EgaltechBlue1}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                            CloseCommand="{Binding CloseMachOptionsCommand, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" SizeToContent="WidthAndHeight">
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
       <local:SplitArcTypeConverter x:Key="SplitArcTypeConverter"/>
@@ -47,7 +47,7 @@
       <UniformGrid Grid.Row="3" Columns="2" Margin="0,0,0,5">
          <TextBlock Text="{Binding SplitArcsMsg}" VerticalAlignment="Center"/>
          <ComboBox ItemsSource="{Binding SplitArcsList}" Height="25" Margin="10,0,0,0"
-            SelectedItem="{Binding SelectedSplitArcs}">
+                   SelectedItem="{Binding SelectedSplitArcs}">
             <ComboBox.ItemTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding Converter={StaticResource SplitArcTypeConverter}}"/>
@@ -59,9 +59,9 @@
       <UniformGrid Grid.Row="4" Columns="2">
          <TextBlock Text="{Binding DefaultSetUpMsg}" VerticalAlignment="Center"/>
          <ComboBox ItemsSource="{Binding ArchivedSetUpList}" Height="25" Margin="10,0,0,0"
-            SelectedItem="{Binding SelectedDefaultSetUp}" IsEnabled="{Binding IsActiveDefaultSetUp}"/>
+                   SelectedItem="{Binding SelectedDefaultSetUp}" IsEnabled="{Binding IsActiveDefaultSetUp}"/>
       </UniformGrid>
 
    </Grid>
-   
+
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/MachinePanel/MachinePanelV.xaml b/MachinePanel/MachinePanelV.xaml
index 1833b32..0c697c6 100644
--- a/MachinePanel/MachinePanelV.xaml
+++ b/MachinePanel/MachinePanelV.xaml
@@ -7,14 +7,14 @@
    <StackPanel Orientation="Horizontal">
       <!--Combobox per selezionare la macchina corrente-->
       <ComboBox ItemsSource="{Binding Path=MachinesList}" DisplayMemberPath="Name"
-          SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
-          Height="22" Width="150" IsEnabled="{Binding MachineListIsEnabled}" Margin="2,0"/>
+                SelectedItem="{Binding Path=SelectedMachine}" SelectedValuePath="Name"
+                Height="22" Width="150" IsEnabled="{Binding MachineListIsEnabled}" Margin="2,0"/>
       <Button Content="{Binding ToolDBMsg}"
-            Command="{Binding ToolDbCommand}"
-            IsEnabled="{Binding ToolDb_IsEnabled}"
-            Width="55"
-            ToolTip="{Binding ToolDBToolTip}"
-            Style="{StaticResource GridViewPanelButton}"/>
+              Command="{Binding ToolDbCommand}"
+              IsEnabled="{Binding ToolDb_IsEnabled}"
+              Width="55"
+              ToolTip="{Binding ToolDBToolTip}"
+              Style="{StaticResource GridViewPanelButton}"/>
       <Button Content="{Binding MachiningDbMsg}"
               Command="{Binding MachDbCommand}"
               IsEnabled="{Binding MachDb_IsEnabled}"
@@ -28,10 +28,10 @@
               ToolTip="{Binding SetUpDbToolTip}"
               Style="{StaticResource GridViewPanelButton}"/>
       <Button Command="{Binding MachOptionsCommand}"
-            ToolTip="{Binding MachOptionsToolTip}">
-          <Image Source="/Resources/MachinePanel/MachineOptions.png"
-              Height="22" />
+              ToolTip="{Binding MachOptionsToolTip}">
+         <Image Source="/Resources/MachinePanel/MachineOptions.png"
+                Height="22" />
       </Button>
-    </StackPanel>
+   </StackPanel>
 
 </EgtFloating:EgtFloatingPanel>
diff --git a/MachiningDbWindow/MyMachiningDbV.xaml b/MachiningDbWindow/MyMachiningDbV.xaml
index 1607487..8d2ee31 100644
--- a/MachiningDbWindow/MyMachiningDbV.xaml
+++ b/MachiningDbWindow/MyMachiningDbV.xaml
@@ -1,24 +1,24 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MyMachiningDbV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:local="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
-   TitleBarBrush="{StaticResource EgaltechBlue1}"
-   BorderBrush="{StaticResource EgaltechBlue1}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
-   IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-   CloseCommand="{Binding CloseMachiningsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-   CloseCommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}">
-   
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                            xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+                            xmlns:local="clr-namespace:EgtCAM5"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}"
+                            BorderBrush="{StaticResource EgaltechBlue1}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            CloseCommand="{Binding CloseMachiningsDbCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                            CloseCommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}">
+
    <EgtWPFLib5:EgtCustomWindow.InputBindings>
       <KeyBinding Key="Escape" Command="{Binding ReloadMachiningCommand}"
-         CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
+                  CommandParameter="{Binding Path=SelectedItem,ElementName=MachiningsTreeView}"/>
    </EgtWPFLib5:EgtCustomWindow.InputBindings>
 
-    <EgtWPFLib5:EgtCustomWindow.Resources>
+   <EgtWPFLib5:EgtCustomWindow.Resources>
       <EgtWPFLib5:DepthUnitConverter x:Key="DepthUnitConverter"/>
       <EgtWPFLib5:ErrorVisibilityConverter x:Key="ErrorVisibilityConverter"/>
       <sys:Int32 x:Key="Invert">0</sys:Int32>
@@ -89,71 +89,71 @@
          <ColumnDefinition Width="1*"/>
       </Grid.ColumnDefinitions>
 
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="1*"/>
-                <RowDefinition Height="11*"/>
-            </Grid.RowDefinitions>
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="11*"/>
+         </Grid.RowDefinitions>
 
-            <UniformGrid Grid.Row="0" Columns="3">
-                <Button Content="New" Command="{Binding NewCommand}"
-               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-               IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"/>
-                <Button Content="Save" Command="{Binding SaveCommand}"
-               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-               IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"/>
-                <Button Content="Remove" Command="{Binding RemoveCommand}"
-               CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
-               IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"/>
-            </UniformGrid>
+         <UniformGrid Grid.Row="0" Columns="3">
+            <Button Content="New" Command="{Binding NewCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledNewBtn, Mode=OneWay}"/>
+            <Button Content="Save" Command="{Binding SaveCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledSaveBtn, Mode=OneWay}"/>
+            <Button Content="Remove" Command="{Binding RemoveCommand}"
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=MachiningsTreeView}"
+                    IsEnabled="{Binding IsEnabledRemoveBtn, Mode=OneWay}"/>
+         </UniformGrid>
 
-            <TreeView Name="MachiningsTreeView" Grid.Row="1"
-            ItemsSource="{Binding Path=MachiningsList}">
+         <TreeView Name="MachiningsTreeView" Grid.Row="1"
+                   ItemsSource="{Binding Path=MachiningsList}">
 
-                <TreeView.ItemContainerStyle>
-                    <Style TargetType="{x:Type TreeViewItem}">
-                        <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-                        <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
-                        <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
-                    </Style>
-                </TreeView.ItemContainerStyle>
+            <TreeView.ItemContainerStyle>
+               <Style TargetType="{x:Type TreeViewItem}">
+                  <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                  <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                  <Setter Property="IsEnabled" Value="{Binding IsEnabled, Mode=TwoWay}" />
+               </Style>
+            </TreeView.ItemContainerStyle>
 
-                <TreeView.Resources>
-                    <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">
+            <TreeView.Resources>
+               <HierarchicalDataTemplate DataType="{x:Type EgtWPFLib5:FamilyMachiningTreeViewItem}" ItemsSource="{Binding Items}">
 
-                        <Grid >
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="1*"/>
-                            </Grid.ColumnDefinitions>
+                  <Grid >
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                     </Grid.ColumnDefinitions>
 
-                            <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />
-                            <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" />
+                     <Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Width="32" Margin="0,8,6,4" />
+                     <TextBlock Grid.Column="1" Text="{Binding Name}" FontSize="15" Margin="10" />
 
-                        </Grid>
+                  </Grid>
 
-                    </HierarchicalDataTemplate>
+               </HierarchicalDataTemplate>
 
-                    <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
-                        <Grid >
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="1*"/>
-                            </Grid.ColumnDefinitions>
+               <DataTemplate DataType="{x:Type EgtWPFLib5:MachiningTreeViewItem}">
+                  <Grid >
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="1*"/>
+                     </Grid.ColumnDefinitions>
 
-                            <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
-                            <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="18" FontSize="15"  Margin="10"/>
+                     <!--<Image Grid.Column="0" Source="{Binding PictureString}" Height="32" Margin="0,8,6,4" />-->
+                     <TextBlock Grid.Column="1" Text="{Binding NamePar}" Height="18" FontSize="15"  Margin="10"/>
 
-                        </Grid>
-                    </DataTemplate>
-                </TreeView.Resources>
+                  </Grid>
+               </DataTemplate>
+            </TreeView.Resources>
 
-            </TreeView>
+         </TreeView>
 
-        </Grid>
+      </Grid>
+
+      <ContentControl Content="{Binding ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
 
-        <ContentControl Content="{Binding ParamPageV}" Grid.Column="1" Grid.ColumnSpan="2"/>
-            
    </Grid>
 
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/MainWindow/MainWindowV.xaml b/MainWindow/MainWindowV.xaml
index 6fb1bfa..e2d96ec 100644
--- a/MainWindow/MainWindowV.xaml
+++ b/MainWindow/MainWindowV.xaml
@@ -1,16 +1,16 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MainWindowV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   xmlns:local="clr-namespace:EgtCAM5"
-   Title="{Binding Title}" Icon="{Binding IconSource}"
-   TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
-   BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
-   MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
-   AboutBoxCommand="{Binding AboutBoxCommand}"
-   AllowDrop="True" Drop="MainWindow_Drop"
-   CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            xmlns:local="clr-namespace:EgtCAM5"
+                            Title="{Binding Title}" Icon="{Binding IconSource}"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}" TitleBarHeight="32"
+                            BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
+                            MinHeight="600" MinWidth="800" WindowStyle="None" ResizeMode="NoResize"
+                            AboutBoxCommand="{Binding AboutBoxCommand}"
+                            AllowDrop="True" Drop="MainWindow_Drop"
+                            CloseCommand="{Binding CloseApplicationCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
    <EgtWPFLib5:EgtCustomWindow.TitlePanel>
       <local:TopCommandBarV DataContext="{StaticResource TopCommandBarViewModel}"/>
    </EgtWPFLib5:EgtCustomWindow.TitlePanel>
diff --git a/OptionPanel/DrawOptionPanelV.xaml b/OptionPanel/DrawOptionPanelV.xaml
index 808bf97..ab7367c 100644
--- a/OptionPanel/DrawOptionPanelV.xaml
+++ b/OptionPanel/DrawOptionPanelV.xaml
@@ -1,8 +1,8 @@
 <UserControl x:Class="DrawOptionPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
+             xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+             xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
 
    <StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <!--ContentPresenter that contains the ManageLayerExpander-->
diff --git a/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpanderV.xaml b/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpanderV.xaml
index 4d8c339..94cdd0b 100644
--- a/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/EstimationsExpander/EstimationsExpanderV.xaml
@@ -1,9 +1,9 @@
 <UserControl x:Class="EstimationsExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:sys="clr-namespace:System;assembly=mscorlib"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
-   
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5">
+
    <StackPanel>
 
       <Expander Header="{Binding EstimationMsg}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml
index bfa68ea..1a6e941 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml
@@ -339,40 +339,83 @@
             </StackPanel>
          </Expander>
 
-         <Expander Header="{Binding NoteExpanderName}" Name="NoteExpander"
+         <Expander Name="NoteExpander"
                    Visibility="{Binding NoteExpanderVisibility, UpdateSourceTrigger=PropertyChanged}"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding NoteExpanderName}"
+                             Margin="2.5"/>
+                  <Button Command="{Binding UpdateNoteCommand}"
+                          Grid.Column="1"
+                          HorizontalAlignment="Right"
+                          Margin="2.5,2.5,14,2.5"
+                          Width="20">
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
+                  </Button>
+               </UniformGrid>
+            </Expander.Header>
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
-               <UniformGrid Columns="2">
-                  <ComboBox ItemsSource="{Binding NotesList}"
-                            SelectedItem="{Binding SelNoteItem}"
-                            SelectedIndex="1">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="Auto"/>
+               </Grid.RowDefinitions>
+               <ListBox ItemsSource="{Binding NotesList}"
+                        SelectedItem="{Binding SelNoteItem}"
+                        Background="Transparent"
+                        BorderBrush="Transparent">
+                  <ListBox.ItemTemplate>
+                     <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
                            <TextBlock Text="{Binding Description}"
                                       Margin="2.5"
+                                      Width="55"
                                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
-                  <EgtWPFLib5:EgtTextBox Text="{Binding sDescriptionVal, UpdateSourceTrigger=PropertyChanged}"
-                                         IsReadOnly="False"
-                                         TextChanged="TextBox_TextChanged"
-                                         Margin="10,0,0,0"
-                                         Style="{DynamicResource MPExpander_UserNotesTxBxMargin}"/>
-               </UniformGrid>
-               <Button Name="UpdateNoteButton"
-                       IsEnabled="False"
-                       Command="{Binding UpdateNoteCommand}"
-                       Grid.Column="1"
-                       Width="20">
-                  <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-               </Button>
+                           <TextBox Text="{Binding DescriptionVal, UpdateSourceTrigger=PropertyChanged}"
+                                    IsReadOnly="False"
+                                    Width="120"
+                                    Margin="10,0,0,0"/>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Width="20"
+                                   Margin="5,0,0,0">
+                              <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
+                           </Button>
+                        </StackPanel>
+                     </DataTemplate>
+                  </ListBox.ItemTemplate>
+                  <ListBox.ItemContainerStyle>
+                     <Style TargetType="ListBoxItem">
+                        <Style.Triggers>
+                           <Trigger Property="IsSelected" Value="True">
+                              <Setter Property="FontWeight" Value="Bold"/>
+                              <Setter Property="Background" Value="Transparent"/>
+                              <Setter Property="Foreground" Value="Black"/>
+                              <Setter Property="FontSize" Value="14"/>
+                           </Trigger>
+                        </Style.Triggers>
+                        <Style.Resources>
+                           <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent"/>
+                        </Style.Resources>
+                     </Style>
+                  </ListBox.ItemContainerStyle>
+               </ListBox>
+               <ComboBox ItemsSource="{Binding NotesListCombo}"
+                         SelectedItem="{Binding SelNoteItemCombo}"
+                         Grid.Row="1"
+                         Grid.ColumnSpan="1"
+                         Visibility="{Binding ComboAddVisibility}">
+                  <ComboBox.ItemTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding Description}"
+                                   Margin="2.5"/>
+                     </DataTemplate>
+                  </ComboBox.ItemTemplate>
+               </ComboBox>
             </Grid>
+
          </Expander>
 
          <Interactivity:Interaction.Behaviors>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml.vb
index c504ccf..887b69e 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/BeamMillingParameterExpanderV.xaml.vb
@@ -81,7 +81,4 @@ Public Class BeamMillingParameterExpanderV
       Return TryCast(target, T)
    End Function
 
-   Private Sub TextBox_TextChanged(sender As Object, e As TextChangedEventArgs)
-      UpdateNoteButton.IsEnabled = True
-   End Sub
 End Class
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml
index 7c87379..2344dee 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml
@@ -195,42 +195,83 @@
             </StackPanel>
          </Expander>
 
-         <Expander Header="{Binding NoteExpanderName}" Name="NoteExpander"
+         <Expander Name="NoteExpander"
                    Visibility="{Binding NoteExpanderVisibility, UpdateSourceTrigger=PropertyChanged}"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding NoteExpanderName}"
+                             Margin="2.5"/>
+                  <Button Command="{Binding UpdateNoteCommand}"
+                          Grid.Column="1"
+                          HorizontalAlignment="Right"
+                          Margin="2.5,2.5,14,2.5"
+                          Width="20">
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
+                  </Button>
+               </UniformGrid>
+            </Expander.Header>
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
-               <StackPanel Orientation="Horizontal">
-                  <ComboBox ItemsSource="{Binding NotesList}"
-                            SelectedItem="{Binding SelNoteItem}"
-                            SelectedIndex="1">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="Auto"/>
+               </Grid.RowDefinitions>
+               <ListBox ItemsSource="{Binding NotesList}"
+                        SelectedItem="{Binding SelNoteItem}"
+                        Background="Transparent"
+                        BorderBrush="Transparent">
+                  <ListBox.ItemTemplate>
+                     <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
                            <TextBlock Text="{Binding Description}"
                                       Margin="2.5"
+                                      Width="55"
                                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
-                  <EgtWPFLib5:EgtTextBox Text="{Binding sDescriptionVal, UpdateSourceTrigger=PropertyChanged}"
-                                         IsReadOnly="False"
-                                         TextChanged="TextBox_TextChanged"
-                                         BorderBrush="Transparent"
-                                         Width="100"
-                                         Margin="10,1,0,1"
-                                         HorizontalAlignment="Right"/>
-               </StackPanel>
-               <Button Name="UpdateNoteButton"
-                       IsEnabled="False"
-                       Command="{Binding UpdateNoteCommand}"
-                       Grid.Column="1"
-                       Width="20">
-                  <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-               </Button>
+                           <TextBox Text="{Binding DescriptionVal, UpdateSourceTrigger=PropertyChanged}"
+                                    IsReadOnly="False"
+                                    Width="120"
+                                    Margin="10,0,0,0"/>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Width="20"
+                                   Margin="5,0,0,0">
+                              <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
+                           </Button>
+                        </StackPanel>
+                     </DataTemplate>
+                  </ListBox.ItemTemplate>
+                  <ListBox.ItemContainerStyle>
+                     <Style TargetType="ListBoxItem">
+                        <Style.Triggers>
+                           <Trigger Property="IsSelected" Value="True">
+                              <Setter Property="FontWeight" Value="Bold"/>
+                              <Setter Property="Background" Value="Transparent"/>
+                              <Setter Property="Foreground" Value="Black"/>
+                              <Setter Property="FontSize" Value="14"/>
+                           </Trigger>
+                        </Style.Triggers>
+                        <Style.Resources>
+                           <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent"/>
+                        </Style.Resources>
+                     </Style>
+                  </ListBox.ItemContainerStyle>
+               </ListBox>
+               <ComboBox ItemsSource="{Binding NotesListCombo}"
+                         SelectedItem="{Binding SelNoteItemCombo}"
+                         Grid.Row="1"
+                         Grid.ColumnSpan="1"
+                         Visibility="{Binding ComboAddVisibility}">
+                  <ComboBox.ItemTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding Description}"
+                                   Margin="2.5"/>
+                     </DataTemplate>
+                  </ComboBox.ItemTemplate>
+               </ComboBox>
             </Grid>
+
          </Expander>
 
          <Interactivity:Interaction.Behaviors>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml.vb
index ce7f795..05ea673 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/GenMachiningParameterExpanderV.xaml.vb
@@ -80,8 +80,4 @@ Public Class GenMachiningParameterExpanderV
       End If
       Return TryCast(target, T)
    End Function
-
-   Private Sub TextBox_TextChanged(sender As Object, e As TextChangedEventArgs)
-      UpdateNoteButton.IsEnabled = True
-   End Sub
 End Class
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml
index 8d0ccae..a3c6026 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml
@@ -232,6 +232,86 @@
                                         Style="{DynamicResource StringParamV_Margin}"/>
             </StackPanel>
          </Expander>
+
+         <Expander Name="NoteExpander"
+                   Visibility="{Binding NoteExpanderVisibility, UpdateSourceTrigger=PropertyChanged}"
+                   Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding NoteExpanderName}"
+                             Margin="2.5"/>
+                  <Button Command="{Binding UpdateNoteCommand}"
+                          Grid.Column="1"
+                          HorizontalAlignment="Right"
+                          Margin="2.5,2.5,14,2.5"
+                          Width="20">
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
+                  </Button>
+               </UniformGrid>
+            </Expander.Header>
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="Auto"/>
+               </Grid.RowDefinitions>
+               <ListBox ItemsSource="{Binding NotesList}"
+                        SelectedItem="{Binding SelNoteItem}"
+                        Background="Transparent"
+                        BorderBrush="Transparent">
+                  <ListBox.ItemTemplate>
+                     <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                           <TextBlock Text="{Binding Description}"
+                                      Margin="2.5"
+                                      Width="55"
+                                      Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
+                           <TextBox Text="{Binding DescriptionVal, UpdateSourceTrigger=PropertyChanged}"
+                                    IsReadOnly="False"
+                                    Width="120"
+                                    Margin="10,0,0,0"/>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Width="20"
+                                   Margin="5,0,0,0">
+                              <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
+                           </Button>
+                        </StackPanel>
+                     </DataTemplate>
+                  </ListBox.ItemTemplate>
+                  <ListBox.ItemContainerStyle>
+                     <Style TargetType="ListBoxItem">
+                        <Style.Triggers>
+                           <Trigger Property="IsSelected" Value="True">
+                              <Setter Property="FontWeight" Value="Bold"/>
+                              <Setter Property="Background" Value="Transparent"/>
+                              <Setter Property="Foreground" Value="Black"/>
+                              <Setter Property="FontSize" Value="14"/>
+                           </Trigger>
+                        </Style.Triggers>
+                        <Style.Resources>
+                           <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent"/>
+                        </Style.Resources>
+                     </Style>
+                  </ListBox.ItemContainerStyle>
+               </ListBox>
+               <ComboBox ItemsSource="{Binding NotesListCombo}"
+                         SelectedItem="{Binding SelNoteItemCombo}"
+                         Grid.Row="1"
+                         Grid.ColumnSpan="1"
+                         Visibility="{Binding ComboAddVisibility}">
+                  <ComboBox.ItemTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding Description}"
+                                   Margin="2.5"/>
+                     </DataTemplate>
+                  </ComboBox.ItemTemplate>
+               </ComboBox>
+            </Grid>
+
+         </Expander>
+
          <Interactivity:Interaction.Behaviors>
             <EgtCAM5:AutomaticCloseExpander/>
          </Interactivity:Interaction.Behaviors>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml.vb
index 0718765..b83cae7 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MortisingParameterExpanderV.xaml.vb
@@ -80,5 +80,4 @@ Public Class MortisingParameterExpanderV
       End If
       Return TryCast(target, T)
    End Function
-
 End Class
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml
index 5827220..2f93ee4 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml
@@ -262,42 +262,83 @@
             </StackPanel>
          </Expander>
 
-         <Expander Header="{Binding NoteExpanderName}" Name="NoteExpander"
+         <Expander Name="NoteExpander"
                    Visibility="{Binding NoteExpanderVisibility, UpdateSourceTrigger=PropertyChanged}"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding NoteExpanderName}"
+                             Margin="2.5"/>
+                  <Button Command="{Binding UpdateNoteCommand}"
+                          Grid.Column="1"
+                          HorizontalAlignment="Right"
+                          Margin="2.5,2.5,14,2.5"
+                          Width="20">
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
+                  </Button>
+               </UniformGrid>
+            </Expander.Header>
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
-               <StackPanel Orientation="Horizontal">
-                  <ComboBox ItemsSource="{Binding NotesList}"
-                            SelectedItem="{Binding SelNoteItem}"
-                            SelectedIndex="1">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="Auto"/>
+               </Grid.RowDefinitions>
+               <ListBox ItemsSource="{Binding NotesList}"
+                        SelectedItem="{Binding SelNoteItem}"
+                        Background="Transparent"
+                        BorderBrush="Transparent">
+                  <ListBox.ItemTemplate>
+                     <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
                            <TextBlock Text="{Binding Description}"
                                       Margin="2.5"
+                                      Width="55"
                                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
-                  <EgtWPFLib5:EgtTextBox Text="{Binding sDescriptionVal, UpdateSourceTrigger=PropertyChanged}"
-                                         IsReadOnly="False"
-                                         TextChanged="TextBox_TextChanged"
-                                         BorderBrush="Transparent"
-                                         Width="100"
-                                         Margin="10,1,0,1"
-                                         HorizontalAlignment="Right"/>
-               </StackPanel>
-               <Button Name="UpdateNoteButton"
-                       IsEnabled="False"
-                       Command="{Binding UpdateNoteCommand}"
-                       Grid.Column="1"
-                       Width="20">
-                  <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-               </Button>
+                           <TextBox Text="{Binding DescriptionVal, UpdateSourceTrigger=PropertyChanged}"
+                                    IsReadOnly="False"
+                                    Width="120"
+                                    Margin="10,0,0,0"/>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Width="20"
+                                   Margin="5,0,0,0">
+                              <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
+                           </Button>
+                        </StackPanel>
+                     </DataTemplate>
+                  </ListBox.ItemTemplate>
+                  <ListBox.ItemContainerStyle>
+                     <Style TargetType="ListBoxItem">
+                        <Style.Triggers>
+                           <Trigger Property="IsSelected" Value="True">
+                              <Setter Property="FontWeight" Value="Bold"/>
+                              <Setter Property="Background" Value="Transparent"/>
+                              <Setter Property="Foreground" Value="Black"/>
+                              <Setter Property="FontSize" Value="14"/>
+                           </Trigger>
+                        </Style.Triggers>
+                        <Style.Resources>
+                           <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent"/>
+                        </Style.Resources>
+                     </Style>
+                  </ListBox.ItemContainerStyle>
+               </ListBox>
+               <ComboBox ItemsSource="{Binding NotesListCombo}"
+                         SelectedItem="{Binding SelNoteItemCombo}"
+                         Grid.Row="1"
+                         Grid.ColumnSpan="1"
+                         Visibility="{Binding ComboAddVisibility}">
+                  <ComboBox.ItemTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding Description}"
+                                   Margin="2.5"/>
+                     </DataTemplate>
+                  </ComboBox.ItemTemplate>
+               </ComboBox>
             </Grid>
+
          </Expander>
 
          <Interactivity:Interaction.Behaviors>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml.vb
index 0c89952..90bb776 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/PocketingParameterExpanderV.xaml.vb
@@ -80,8 +80,4 @@ Public Class PocketingParameterExpanderV
       End If
       Return TryCast(target, T)
    End Function
-
-   Private Sub TextBox_TextChanged(sender As Object, e As TextChangedEventArgs)
-      UpdateNoteButton.IsEnabled = True
-   End Sub
 End Class
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml
index f716d15..4c72784 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml
@@ -314,42 +314,83 @@
             </StackPanel>
          </Expander>
 
-         <Expander Header="{Binding NoteExpanderName}" Name="NoteExpander"
+         <Expander Name="NoteExpander"
                    Visibility="{Binding NoteExpanderVisibility, UpdateSourceTrigger=PropertyChanged}"
                    Style="{StaticResource ExpanderStyle}" Margin="0,1,0,1">
+            <Expander.Header>
+               <UniformGrid Columns="2">
+                  <TextBlock Text="{Binding NoteExpanderName}"
+                             Margin="2.5"/>
+                  <Button Command="{Binding UpdateNoteCommand}"
+                          Grid.Column="1"
+                          HorizontalAlignment="Right"
+                          Margin="2.5,2.5,14,2.5"
+                          Width="20">
+                     <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
+                  </Button>
+               </UniformGrid>
+            </Expander.Header>
             <Grid>
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
                </Grid.ColumnDefinitions>
-               <StackPanel Orientation="Horizontal">
-                  <ComboBox ItemsSource="{Binding NotesList}"
-                            SelectedItem="{Binding SelNoteItem}"
-                            SelectedIndex="1">
-                     <ComboBox.ItemTemplate>
-                        <DataTemplate>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="Auto"/>
+               </Grid.RowDefinitions>
+               <ListBox ItemsSource="{Binding NotesList}"
+                        SelectedItem="{Binding SelNoteItem}"
+                        Background="Transparent"
+                        BorderBrush="Transparent">
+                  <ListBox.ItemTemplate>
+                     <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
                            <TextBlock Text="{Binding Description}"
                                       Margin="2.5"
+                                      Width="55"
                                       Style="{DynamicResource MPExpander_UserNotesTxBlMargin}"/>
-                        </DataTemplate>
-                     </ComboBox.ItemTemplate>
-                  </ComboBox>
-                  <EgtWPFLib5:EgtTextBox Text="{Binding sDescriptionVal, UpdateSourceTrigger=PropertyChanged}"
-                                         IsReadOnly="False"
-                                         TextChanged="TextBox_TextChanged"
-                                         BorderBrush="Transparent"
-                                         Width="100"
-                                         Margin="10,1,0,1"
-                                         HorizontalAlignment="Right"/>
-               </StackPanel>
-               <Button Name="UpdateNoteButton"
-                       IsEnabled="False"
-                       Command="{Binding UpdateNoteCommand}"
-                       Grid.Column="1"
-                       Width="20">
-                  <Image Source="/Resources/Note/+.png" Stretch="Uniform"/>
-               </Button>
+                           <TextBox Text="{Binding DescriptionVal, UpdateSourceTrigger=PropertyChanged}"
+                                    IsReadOnly="False"
+                                    Width="120"
+                                    Margin="10,0,0,0"/>
+                           <Button Command="{Binding RemoveItemNoteCommand}"
+                                   Width="20"
+                                   Margin="5,0,0,0">
+                              <Image Source="/Resources/Note/-.png" Stretch="Uniform"/>
+                           </Button>
+                        </StackPanel>
+                     </DataTemplate>
+                  </ListBox.ItemTemplate>
+                  <ListBox.ItemContainerStyle>
+                     <Style TargetType="ListBoxItem">
+                        <Style.Triggers>
+                           <Trigger Property="IsSelected" Value="True">
+                              <Setter Property="FontWeight" Value="Bold"/>
+                              <Setter Property="Background" Value="Transparent"/>
+                              <Setter Property="Foreground" Value="Black"/>
+                              <Setter Property="FontSize" Value="14"/>
+                           </Trigger>
+                        </Style.Triggers>
+                        <Style.Resources>
+                           <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="Transparent"/>
+                        </Style.Resources>
+                     </Style>
+                  </ListBox.ItemContainerStyle>
+               </ListBox>
+               <ComboBox ItemsSource="{Binding NotesListCombo}"
+                         SelectedItem="{Binding SelNoteItemCombo}"
+                         Grid.Row="1"
+                         Grid.ColumnSpan="1"
+                         Visibility="{Binding ComboAddVisibility}">
+                  <ComboBox.ItemTemplate>
+                     <DataTemplate>
+                        <TextBlock Text="{Binding Description}"
+                                   Margin="2.5"/>
+                     </DataTemplate>
+                  </ComboBox.ItemTemplate>
+               </ComboBox>
             </Grid>
+
          </Expander>
 
          <Interactivity:Interaction.Behaviors>
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml.vb
index b6a6c6d..a14bbee 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/StoneSawingParameterExpanderV.xaml.vb
@@ -80,8 +80,4 @@ Public Class StoneSawingParameterExpanderV
       End If
       Return TryCast(target, T)
    End Function
-
-   Private Sub TextBox_TextChanged(sender As Object, e As TextChangedEventArgs)
-      UpdateNoteButton.IsEnabled = True
-   End Sub
 End Class
diff --git a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderV.xaml
index 782b2ec..274920c 100644
--- a/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationParametersExpander/OperationParametersExpanderV.xaml
@@ -1,6 +1,6 @@
 <UserControl x:Class="OperationParametersExpanderV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
    <StackPanel Name="OperationParametersExpanderViewStackPanel" IsEnabled="{Binding OperParamsViewIsEnabled}">
 
@@ -13,7 +13,7 @@
          <!--ContentPresenter that contains the OperationParameters-->
          <ContentPresenter Name="OperationParameters" Content="{Binding OperationParameters,Mode=OneWay}"/>
 
-      </Expander> 
+      </Expander>
 
    </StackPanel>
 
diff --git a/OptionPanel/MachiningOptionPanelV.xaml b/OptionPanel/MachiningOptionPanelV.xaml
index 8bf918d..1434f04 100644
--- a/OptionPanel/MachiningOptionPanelV.xaml
+++ b/OptionPanel/MachiningOptionPanelV.xaml
@@ -1,8 +1,8 @@
 <UserControl x:Class="MachiningOptionPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
-   xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-   xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Width="250"
+             xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+             xmlns:interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity">
 
    <StackPanel Name="ciao" Background="Transparent" MaxHeight="{Binding MaxHeight,RelativeSource={RelativeSource AncestorType={x:Type EgtFloating:EgtFloatingPanel}}}">
       <!--ContentPresenter that contains the OperationsListExpander-->
@@ -20,6 +20,6 @@
               IsEnabled="{Binding GenerateIsEnabled}"
               Command="{Binding GenerateCommand}"/>
 
-    </StackPanel>
+   </StackPanel>
 
 </UserControl>
diff --git a/OptionsWindow/MachineBox.xaml b/OptionsWindow/MachineBox.xaml
index 41676de..1f29b12 100644
--- a/OptionsWindow/MachineBox.xaml
+++ b/OptionsWindow/MachineBox.xaml
@@ -1,10 +1,10 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MachineBox"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-    Height="160" Width="380" WindowStyle="None" ResizeMode="NoResize" 
-    TitleBarHeight="30" IsResizable="False" IsMinimizable="False"
-    ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Height="160" Width="380" WindowStyle="None" ResizeMode="NoResize" 
+                            TitleBarHeight="30" IsResizable="False" IsMinimizable="False"
+                            ShowInTaskbar="False" WindowStartupLocation="CenterOwner">
 
    <Border BorderThickness="2" BorderBrush="LightBlue">
       <Grid >
@@ -22,7 +22,7 @@
          </Grid.RowDefinitions>
 
          <TextBlock Name="MessageLbl" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center"
-               VerticalAlignment="Center" />
+                    VerticalAlignment="Center" />
          <UniformGrid Grid.Column="1" Grid.Row="3" Columns="3">
             <Button Name="ReplaceBtn" Height="26" Margin="0,0,5,0"/>
             <Button Name="UpdateBtn" Height="26" Margin="5,0,5,0"/>
diff --git a/OptionsWindow/OptionWindowV.xaml b/OptionsWindow/OptionWindowV.xaml
index ebd54a0..26286a1 100644
--- a/OptionsWindow/OptionWindowV.xaml
+++ b/OptionsWindow/OptionWindowV.xaml
@@ -1,21 +1,21 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="OptionWindowV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:local="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
-   TitleBarBrush="{StaticResource EgaltechBlue1}"
-   BorderBrush="{StaticResource EgaltechBlue1}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
-   IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-   MinWidth="400" MinHeight="382"
-   Width="400" Height="412"
-   CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
-   
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:local="clr-namespace:EgtCAM5"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}"
+                            BorderBrush="{StaticResource EgaltechBlue1}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
+                            MinWidth="400" MinHeight="382"
+                            Width="400" Height="412"
+                            CloseCommand="{Binding CloseOptionsCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
+
    <EgtWPFLib5:EgtCustomWindow.Resources>
       <local:GeomTypeConverter x:Key="GeomTypeConverter"/>
    </EgtWPFLib5:EgtCustomWindow.Resources>
-   
+
    <TabControl Margin="5,5,5,5">
       <TabItem Header="{Binding GenericMsg}">
          <StackPanel Margin="5,5,5,0">
@@ -26,7 +26,7 @@
                             DisplayMemberPath="Name" SelectedItem="{Binding SelectedLanguage}"
                             Margin="0,0,0,5"/>
                   <TextBlock Text="{Binding LanguageAdvertMsg}" TextWrapping="Wrap"
-                  TextAlignment="Center"/>
+                             TextAlignment="Center"/>
                </UniformGrid>
             </GroupBox>
             <UniformGrid Columns="2"
@@ -66,14 +66,14 @@
                <TextBlock Text="{Binding SmoothTriMeshMsg}" VerticalAlignment="Center"
                           Grid.Row="1" Margin="0,5,0,5"/>
                <CheckBox IsChecked="{Binding SmoothTriMesh}"
-                          Grid.Column="1" Grid.Row="1" Margin="22,5,0,5" VerticalAlignment="Center"/>
+                         Grid.Column="1" Grid.Row="1" Margin="22,5,0,5" VerticalAlignment="Center"/>
             </Grid>
             <UniformGrid Columns="2"
-                     Margin="0,0,0,5">
-                <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
-                <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
-                            SelectedItem="{Binding SelectedTextFont}" Height="25"
-                            Margin="10,5,0,0"/>
+                         Margin="0,0,0,5">
+               <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
+               <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
+                         SelectedItem="{Binding SelectedTextFont}" Height="25"
+                         Margin="10,5,0,0"/>
             </UniformGrid>
             <Grid Margin="5,5,5,5">
                <Button Content="{Binding UpdateLicenceMsg}" Command="{Binding UpdateLicence_Command}"  Height="26" Margin="100,1"/>
@@ -96,99 +96,99 @@
                         VerticalContentAlignment="Center"
                         Margin="10,0,0,0"/>
             </UniformGrid>
-                <GroupBox Grid.Column="1" Grid.RowSpan="2"
+            <GroupBox Grid.Column="1" Grid.RowSpan="2"
                       Header="{Binding DimensionMsg}"
                       Margin="0,0,0,5">
-                    <UniformGrid Grid.ColumnSpan="2" Columns="2">
-                        <TextBlock Text="{Binding ExtLineLenMsg}" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding ExtLineLen}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding ArrowLenMsg}" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding ArrowLen}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding TextDistMsg}" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding TextDist}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding LenIsMMMsg}" VerticalAlignment="Center"/>
-                        <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
-                                 SelectedItem="{Binding SelectedUnitMeasure}" Height="25"
-                                 Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding DecDigitMsg}" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding DecDigit}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
-                        <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
-                                 SelectedItem="{Binding SelectedFont}" Height="25"
-                                 Margin="10,5,0,0"/>
-                        <TextBlock Text="{Binding TextHeightMsg}" VerticalAlignment="Center"/>
-                        <TextBox Text="{Binding TextHeight}" Height="25"
-                                 VerticalContentAlignment="Center"
-                                 Margin="10,5,0,0"/>
-                    </UniformGrid>
-                </GroupBox>
-            </StackPanel>
-          
+               <UniformGrid Grid.ColumnSpan="2" Columns="2">
+                  <TextBlock Text="{Binding ExtLineLenMsg}" VerticalAlignment="Center"/>
+                  <TextBox Text="{Binding ExtLineLen}" Height="25"
+                           VerticalContentAlignment="Center"
+                           Margin="10,5,0,0"/>
+                  <TextBlock Text="{Binding ArrowLenMsg}" VerticalAlignment="Center"/>
+                  <TextBox Text="{Binding ArrowLen}" Height="25"
+                           VerticalContentAlignment="Center"
+                           Margin="10,5,0,0"/>
+                  <TextBlock Text="{Binding TextDistMsg}" VerticalAlignment="Center"/>
+                  <TextBox Text="{Binding TextDist}" Height="25"
+                           VerticalContentAlignment="Center"
+                           Margin="10,5,0,0"/>
+                  <TextBlock Text="{Binding LenIsMMMsg}" VerticalAlignment="Center"/>
+                  <ComboBox ItemsSource="{Binding UnitMeasureList, Mode=OneWay}"
+                            SelectedItem="{Binding SelectedUnitMeasure}" Height="25"
+                            Margin="10,5,0,0"/>
+                  <TextBlock Text="{Binding DecDigitMsg}" VerticalAlignment="Center"/>
+                  <TextBox Text="{Binding DecDigit}" Height="25"
+                           VerticalContentAlignment="Center"
+                           Margin="10,5,0,0"/>
+                  <TextBlock Text="{Binding FontMsg}" VerticalAlignment="Center"/>
+                  <ComboBox ItemsSource="{Binding FontList, Mode=OneWay}"
+                            SelectedItem="{Binding SelectedFont}" Height="25"
+                            Margin="10,5,0,0"/>
+                  <TextBlock Text="{Binding TextHeightMsg}" VerticalAlignment="Center"/>
+                  <TextBox Text="{Binding TextHeight}" Height="25"
+                           VerticalContentAlignment="Center"
+                           Margin="10,5,0,0"/>
+               </UniformGrid>
+            </GroupBox>
+         </StackPanel>
+
       </TabItem>
       <TabItem Header="{Binding ImportMsg}">
          <StackPanel Margin="5,5,5,0">
-                <Grid Margin="0,5,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="0.8*"/>
-                        <ColumnDefinition Width="1*"/>
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                        <RowDefinition Height="1*"/>
-                    </Grid.RowDefinitions>
-                    <TextBlock Grid.Row="0" Grid.Column="1" 
-                             VerticalAlignment="Center" HorizontalAlignment="Center"  
-                             Text="{Binding UnitScaleMsg}" />
-                    <TextBlock Grid.Row="0" Grid.Column="2" 
-                             VerticalAlignment="Center" HorizontalAlignment="Center"  
-                             Text="{Binding FactorScaleMsg}"/>
-                    
-                    <TextBlock Grid.Row="1" Grid.Column="0" 
-                             Text="{Binding DxfScaleFactorMsg}" VerticalAlignment="Center"/>
-                    <ComboBox  Grid.Row="1" Grid.Column="1"
+            <Grid Margin="0,5,0,0">
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="1*"/>
+                  <ColumnDefinition Width="0.8*"/>
+                  <ColumnDefinition Width="1*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+                  <RowDefinition Height="1*"/>
+               </Grid.RowDefinitions>
+               <TextBlock Grid.Row="0" Grid.Column="1" 
+                          VerticalAlignment="Center" HorizontalAlignment="Center"  
+                          Text="{Binding UnitScaleMsg}" />
+               <TextBlock Grid.Row="0" Grid.Column="2" 
+                          VerticalAlignment="Center" HorizontalAlignment="Center"  
+                          Text="{Binding FactorScaleMsg}"/>
+
+               <TextBlock Grid.Row="1" Grid.Column="0" 
+                          Text="{Binding DxfScaleFactorMsg}" VerticalAlignment="Center"/>
+               <ComboBox Grid.Row="1" Grid.Column="1"
                          ItemsSource="{Binding ScaleDXFList, Mode=OneWay}"
                          SelectedItem="{Binding SelectedDXFScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
                          Margin="10,0,0,5"/>
-                    <TextBox  Grid.Row="1" Grid.Column="2"
+               <TextBox Grid.Row="1" Grid.Column="2"
                         Text="{Binding DxfScaleFactor}" Height="25"
                         IsEnabled="{Binding DXFScaleEnable, UpdateSourceTrigger=LostFocus}"
                         VerticalContentAlignment="Center"
                         Margin="10,0,0,5"/>
-                    <TextBlock Grid.Row="2" Grid.Column="0"
-                        Text="{Binding StlScaleFactorMsg}" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Row="2" Grid.Column="1"
-                        ItemsSource="{Binding ScaleSTLList, Mode=OneWay}"
+               <TextBlock Grid.Row="2" Grid.Column="0"
+                          Text="{Binding StlScaleFactorMsg}" VerticalAlignment="Center"/>
+               <ComboBox Grid.Row="2" Grid.Column="1"
+                         ItemsSource="{Binding ScaleSTLList, Mode=OneWay}"
                          SelectedItem="{Binding SelectedSTLScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
                          Margin="10,0,0,5"/>
-                    <TextBox Grid.Row="2" Grid.Column="2"
+               <TextBox Grid.Row="2" Grid.Column="2"
                         Text="{Binding StlScaleFactor}" Height="25"
                         IsEnabled="{Binding STLScaleEnable, UpdateSourceTrigger=LostFocus}"
                         VerticalContentAlignment="Center"
                         Margin="10,0,0,5"/>
-                    <TextBlock Grid.Row="3" Grid.Column="0"
-                        Text="{Binding ImageScaleFactorMsg}" VerticalAlignment="Center"/>
-                    <ComboBox Grid.Row="3" Grid.Column="1"
-                        ItemsSource="{Binding ScaleImageList, Mode=OneWay}"
+               <TextBlock Grid.Row="3" Grid.Column="0"
+                          Text="{Binding ImageScaleFactorMsg}" VerticalAlignment="Center"/>
+               <ComboBox Grid.Row="3" Grid.Column="1"
+                         ItemsSource="{Binding ScaleImageList, Mode=OneWay}"
                          SelectedItem="{Binding SelectedImageScale, UpdateSourceTrigger=PropertyChanged}" Height="25"
                          Margin="10,0,0,5"/>
-                    <TextBox Grid.Row="3" Grid.Column="2"
+               <TextBox Grid.Row="3" Grid.Column="2"
                         Text="{Binding ImageScaleFactor}" Height="25"
                         IsEnabled="{Binding ImageScaleEnable, UpdateSourceTrigger=LostFocus}"
-                         VerticalContentAlignment="Center"
-                         Margin="10,0,0,5"/>
-                </Grid>
-            </StackPanel>
+                        VerticalContentAlignment="Center"
+                        Margin="10,0,0,5"/>
+            </Grid>
+         </StackPanel>
       </TabItem>
       <TabItem Header="{Binding ExportMsg}">
          <StackPanel>
@@ -196,15 +196,15 @@
                       Header="{Binding ImageMsg}"
                       Margin="5,5,5,0">
                <UniformGrid Grid.ColumnSpan="2" Columns="2">
-               <TextBlock Text="{Binding ImageWidthMsg}" VerticalAlignment="Center"/>
-               <TextBox Text="{Binding ImageWidth}" Height="25"
-                        VerticalContentAlignment="Center"
-                        Margin="10,0,0,5"/>
-               <TextBlock Text="{Binding ImageHeightMsg}" VerticalAlignment="Center"/>
-               <TextBox Text="{Binding ImageHeight}" Height="25"
-                        VerticalContentAlignment="Center"
-                        Margin="10,0,0,5"/>
-            </UniformGrid>
+                  <TextBlock Text="{Binding ImageWidthMsg}" VerticalAlignment="Center"/>
+                  <TextBox Text="{Binding ImageWidth}" Height="25"
+                           VerticalContentAlignment="Center"
+                           Margin="10,0,0,5"/>
+                  <TextBlock Text="{Binding ImageHeightMsg}" VerticalAlignment="Center"/>
+                  <TextBox Text="{Binding ImageHeight}" Height="25"
+                           VerticalContentAlignment="Center"
+                           Margin="10,0,0,5"/>
+               </UniformGrid>
             </GroupBox>
          </StackPanel>
       </TabItem>
@@ -271,7 +271,7 @@
                   </ComboBox>
                </UniformGrid>
             </GroupBox>
-            
+
             <Grid Margin="5,5,5,0">
                <Grid.ColumnDefinitions>
                   <ColumnDefinition Width="2*"/>
@@ -296,7 +296,7 @@
             </Grid>
 
             <Grid Margin="5,5,5,0">
-                <Button Content="{Binding ExportMachineMsg}" Command="{Binding ExportMachine_Command}"  Height="26" Margin="100,1"/>
+               <Button Content="{Binding ExportMachineMsg}" Command="{Binding ExportMachine_Command}"  Height="26" Margin="100,1"/>
             </Grid>
          </StackPanel>
       </TabItem>
@@ -343,9 +343,9 @@
                <CheckBox IsChecked="{Binding GunstockOn}" IsEnabled="{Binding GunstockEnabled}"
                          Grid.Row="4" Grid.Column="1"  Margin="4,5,0,5" VerticalAlignment="Center"/>
             </Grid>
-         </StackPanel>   
+         </StackPanel>
       </TabItem>
 
    </TabControl>
-   
+
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/PopUpGridPanel/PopUpGridPanelV.xaml b/PopUpGridPanel/PopUpGridPanelV.xaml
index d002967..2c50310 100644
--- a/PopUpGridPanel/PopUpGridPanelV.xaml
+++ b/PopUpGridPanel/PopUpGridPanelV.xaml
@@ -1,6 +1,6 @@
 <UserControl x:Class="PopUpGridPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
    <StackPanel Background="Transparent" Orientation="Horizontal">
       <Button Command="{Binding CPlaneViewCommand}" ToolTip="{Binding CPlaneViewToolTip}" Style="{StaticResource GridViewPanelButton}">
diff --git a/PopUpViewPanel/PopUpViewPanelV.xaml b/PopUpViewPanel/PopUpViewPanelV.xaml
index 6b0eda0..c12f029 100644
--- a/PopUpViewPanel/PopUpViewPanelV.xaml
+++ b/PopUpViewPanel/PopUpViewPanelV.xaml
@@ -1,6 +1,6 @@
 <UserControl x:Class="PopUpViewPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
    <StackPanel Background="Transparent" Orientation="Horizontal">
       <Button ToolTip="{Binding ZoomInToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomInCommand}">
diff --git a/Resources/Note/-.png b/Resources/Note/-.png
new file mode 100644
index 0000000..4ff0862
Binary files /dev/null and b/Resources/Note/-.png differ
diff --git a/SelMachGroupWnd/SelMachGroupWndV.xaml b/SelMachGroupWnd/SelMachGroupWndV.xaml
index e3354f4..9e92052 100644
--- a/SelMachGroupWnd/SelMachGroupWndV.xaml
+++ b/SelMachGroupWnd/SelMachGroupWndV.xaml
@@ -1,13 +1,13 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="SelMachGroupWndV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding TitleMsg}"
-   Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32" Width="290"
-   IsResizable="False"
-   IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
-   IsClosable="{Binding IsClosable}" SizeToContent="Height">
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding TitleMsg}"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="32" Width="290"
+                            IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
+                            IsClosable="{Binding IsClosable}" SizeToContent="Height">
 
    <StackPanel Margin="0,5,0,0">
 
diff --git a/SetUpDb/SetUpDbV.xaml b/SetUpDb/SetUpDbV.xaml
index 63a7e75..f156cea 100644
--- a/SetUpDb/SetUpDbV.xaml
+++ b/SetUpDb/SetUpDbV.xaml
@@ -170,24 +170,24 @@
          </Grid>
 
          <Button Content="+"
-                  Height="20"
-                  Width="20"
-                  VerticalAlignment="Center"
-                  Focusable="False"
-                  Margin="2.5,0,2.5,0"
-                  Command="{Binding AddSetup_Command}"
-                  Grid.Column="3"
-                  IsEnabled="{Binding IsEnabledAddRemove}"/>
+                 Height="20"
+                 Width="20"
+                 VerticalAlignment="Center"
+                 Focusable="False"
+                 Margin="2.5,0,2.5,0"
+                 Command="{Binding AddSetup_Command}"
+                 Grid.Column="3"
+                 IsEnabled="{Binding IsEnabledAddRemove}"/>
               
          <Button Content="-" 
-                  Height="20" 
-                  Width="20" 
-                  VerticalAlignment="Center" 
-                  Focusable="False"
-                  Margin="2.5,0,0,0" 
-                  Command="{Binding RemoveSetup_Command}" 
-                  Grid.Column="4"
-                  IsEnabled="{Binding IsEnabledAddRemove}"/>
+                 Height="20" 
+                 Width="20" 
+                 VerticalAlignment="Center" 
+                 Focusable="False"
+                 Margin="2.5,0,0,0" 
+                 Command="{Binding RemoveSetup_Command}" 
+                 Grid.Column="4"
+                 IsEnabled="{Binding IsEnabledAddRemove}"/>
             
       </Grid>
       
diff --git a/ShowPanel/ShowPanelV.xaml b/ShowPanel/ShowPanelV.xaml
index 3c5af8f..f0684dd 100644
--- a/ShowPanel/ShowPanelV.xaml
+++ b/ShowPanel/ShowPanelV.xaml
@@ -1,6 +1,6 @@
 <UserControl x:Class="ShowPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
    <StackPanel Background="Transparent" Orientation="Horizontal">
       <RadioButton ToolTip="{Binding RenderingWFToolTip}" Style="{StaticResource GridViewPanelRadioButton}" IsChecked="{Binding WireframeIsChecked}">
diff --git a/Special-Doors/DoorPanelV.xaml b/Special-Doors/DoorPanelV.xaml
index 8a07e29..0281329 100644
--- a/Special-Doors/DoorPanelV.xaml
+++ b/Special-Doors/DoorPanelV.xaml
@@ -7,16 +7,16 @@
    <!--Barra superiore dei comandi-->
    <StackPanel Background="Transparent" Orientation="Horizontal">
       <Button Command="{Binding DoorsCommand}" Style="{StaticResource GridViewPanelButton}"
-         Width="55" Content="DOORS" ContextMenuService.Placement="Bottom" Visibility="{Binding DoorsBtn_Visibility}">
+              Width="55" Content="DOORS" ContextMenuService.Placement="Bottom" Visibility="{Binding DoorsBtn_Visibility}">
          <Button.ContextMenu>
             <ContextMenu ItemsSource="{Binding MruDoorNames}" ItemContainerStyle="{StaticResource MruDoorItem}">
             </ContextMenu>
          </Button.ContextMenu>
       </Button>
       <Button Command="{Binding DMachCommand}" Style="{StaticResource GridViewPanelButton}"
-         Width="55" Content="DMACH" Visibility="{Binding DMachBtn_Visibility}"/>
+              Width="55" Content="DMACH" Visibility="{Binding DMachBtn_Visibility}"/>
       <Button Command="{Binding MTableDbCommand}"
-         Style="{StaticResource GridViewPanelButton}" Width="65" Content="MTABLE"
+              Style="{StaticResource GridViewPanelButton}" Width="65" Content="MTABLE"
               IsEnabled="{Binding MTableDb_IsEnabled}"/>
    </StackPanel>
 
diff --git a/Special-Doors/MTableDbV.xaml b/Special-Doors/MTableDbV.xaml
index d74d865..6d08a31 100644
--- a/Special-Doors/MTableDbV.xaml
+++ b/Special-Doors/MTableDbV.xaml
@@ -1,16 +1,16 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="MTableDbV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtCAM5="clr-namespace:EgtCAM5"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
-   TitleBarBrush="{StaticResource EgaltechBlue1}"
-   BorderBrush="{StaticResource EgaltechBlue1}"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30"
-   IsMinimizable="False" ShowInTaskbar="False"
-   CloseCommand="{Binding CloseMTableWindowCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
-   CloseCommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}">
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+                            xmlns:EgtCAM5="clr-namespace:EgtCAM5"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding Title}" Icon="/Resources/EgtCAM5.ico"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}"
+                            BorderBrush="{StaticResource EgaltechBlue1}"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30"
+                            IsMinimizable="False" ShowInTaskbar="False"
+                            CloseCommand="{Binding CloseMTableWindowCommand,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                            CloseCommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}">
    <EgtWPFLib5:EgtCustomWindow.InputBindings>
       <KeyBinding Key="F" Modifiers="Control" Command="{Binding FocusSearchCommand}"/>
    </EgtWPFLib5:EgtCustomWindow.InputBindings>
@@ -19,7 +19,7 @@
       <EgtCAM5:GroupConverter x:Key="GroupConverter"/>
       <EgtCAM5:PropertyConverter x:Key="PropertyConverter"/>
    </EgtWPFLib5:EgtCustomWindow.Resources>
-   
+
    <Grid Margin="5,5,5,0">
       <Grid.ColumnDefinitions>
          <ColumnDefinition Width="Auto"/>
@@ -34,37 +34,37 @@
 
          <UniformGrid Grid.Row="0" Columns="5" Margin="0,0,0,5">
             <Button Command="{Binding NewTableCommand}"
-               CommandParameter="{Binding SelectedItem,ElementName=TablesListBox}"
-               ToolTip="{Binding NewTableToolTip}"
-               Style="{StaticResource MTableWindowButton}">
+                    CommandParameter="{Binding SelectedItem,ElementName=TablesListBox}"
+                    ToolTip="{Binding NewTableToolTip}"
+                    Style="{StaticResource MTableWindowButton}">
                <Image Source="/Resources/TopCommandBar/New.png" Stretch="Uniform"/>
             </Button>
             <Button Command="{Binding SaveTableCommand}"
-               CommandParameter="{Binding SelectedItem,ElementName=TablesListBox}"
-               ToolTip="{Binding SaveTableToolTip}" Style="{StaticResource MTableWindowButton}">
+                    CommandParameter="{Binding SelectedItem,ElementName=TablesListBox}"
+                    ToolTip="{Binding SaveTableToolTip}" Style="{StaticResource MTableWindowButton}">
                <Image Source="/Resources/TopCommandBar/Save.png" Stretch="Uniform"/>
             </Button>
             <Button Command="{Binding SaveTableAsCommand}" 
-               CommandParameter="{Binding SelectedItem,ElementName=TablesListBox}"
-               ToolTip="{Binding SaveAsTableToolTip}" Style="{StaticResource MTableWindowButton}">
+                    CommandParameter="{Binding SelectedItem,ElementName=TablesListBox}"
+                    ToolTip="{Binding SaveAsTableToolTip}" Style="{StaticResource MTableWindowButton}">
                <Image Source="/Resources/TopCommandBar/SaveAs.png" Stretch="Uniform"/>
             </Button>
             <Button Command="{Binding RemoveTableCommand}"
-               CommandParameter="{Binding SelectedItem,ElementName=TablesListBox}"
-               ToolTip="{Binding RemoveTableToolTip}"
-               Style="{StaticResource MTableWindowButton}">
+                    CommandParameter="{Binding SelectedItem,ElementName=TablesListBox}"
+                    ToolTip="{Binding RemoveTableToolTip}"
+                    Style="{StaticResource MTableWindowButton}">
                <Image Source="/Resources/DrawPanel/Delete.png" Stretch="Uniform"/>
             </Button>
             <Button Command="{Binding SetActiveTableCommand}"
-               CommandParameter="{Binding SelectedItem,ElementName=TablesListBox}"
-               ToolTip="{Binding SetActiveTableToolTip}"
-               Style="{StaticResource MTableWindowButton}">
+                    CommandParameter="{Binding SelectedItem,ElementName=TablesListBox}"
+                    ToolTip="{Binding SetActiveTableToolTip}"
+                    Style="{StaticResource MTableWindowButton}">
                <Ellipse Height="10" Width="10" Fill="{StaticResource EgaltechBlue1}" />
             </Button>
          </UniformGrid>
 
          <ListBox x:Name="TablesListBox" Grid.Row="1" ItemsSource="{Binding TablesList}"
-            IsSynchronizedWithCurrentItem="False">
+                  IsSynchronizedWithCurrentItem="False">
             <ListBox.ItemContainerStyle>
                <Style TargetType="{x:Type ListBoxItem}">
                   <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
@@ -96,8 +96,8 @@
             </Grid.RowDefinitions>
 
             <GroupBox Grid.Row="0" Header="{Binding MachListHeader}" BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="2"
-               Padding="3" Margin="2,2,2,2">
-               
+                      Padding="3" Margin="2,2,2,2">
+
                <ListBox Name="MachineList"
                         IsSynchronizedWithCurrentItem="True"
                         ItemsSource="{Binding Path=SelectedItem.ActiveMachinesList, ElementName=TablesListBox}"
@@ -140,21 +140,21 @@
                <TabItem Header="Association Table">
                   <TabItem.Content>
                      <DataGrid Name="AssociationDataGrid"
-                        ItemsSource="{Binding Path=SelectedItem.AssociationList,
+                               ItemsSource="{Binding Path=SelectedItem.AssociationList,
                                                      ElementName=TablesListBox}"
-                        SelectedItem="{Binding Path=SelectedItem.SelectedAssociation,
+                               SelectedItem="{Binding Path=SelectedItem.SelectedAssociation,
                                                       ElementName=TablesListBox,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                        IsSynchronizedWithCurrentItem="False"
-                        AutoGenerateColumns="False"
-                        CanUserSortColumns="False"
-                        CanUserResizeColumns="False"
-                        CanUserResizeRows="False"
-                        CanUserReorderColumns="False"
-                        SelectionMode="Single"
-                        ScrollViewer.CanContentScroll="True" 
-                        ScrollViewer.VerticalScrollBarVisibility="Auto"
-                        ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-                        VirtualizingStackPanel.IsVirtualizing="False">
+                               IsSynchronizedWithCurrentItem="False"
+                               AutoGenerateColumns="False"
+                               CanUserSortColumns="False"
+                               CanUserResizeColumns="False"
+                               CanUserResizeRows="False"
+                               CanUserReorderColumns="False"
+                               SelectionMode="Single"
+                               ScrollViewer.CanContentScroll="True" 
+                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                               ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                               VirtualizingStackPanel.IsVirtualizing="False">
                         <Interactivity:Interaction.Behaviors>
                            <EgtCAM5:ScrollIntoViewForDataGrid/>
                         </Interactivity:Interaction.Behaviors>
@@ -194,14 +194,14 @@
                               <DataGridTemplateColumn.CellEditingTemplate>
                                  <DataTemplate>
                                     <ComboBox IsEditable="False" 
-                                       SelectedItem="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       ItemsSource="{Binding Path=NamesList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                              SelectedItem="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                              ItemsSource="{Binding Path=NamesList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellEditingTemplate>
                               <DataGridTemplateColumn.CellTemplate>
                                  <DataTemplate>
                                     <TextBlock Text="{Binding Path=Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" 
-                                       ToolTip="{Binding Path=Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                                               ToolTip="{Binding Path=Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>
@@ -214,8 +214,8 @@
                               <DataGridTemplateColumn.CellEditingTemplate>
                                  <DataTemplate>
                                     <ComboBox IsEditable="False" 
-                                       SelectedItem="{Binding Oper,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       ItemsSource="{Binding Path=OperationsList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                              SelectedItem="{Binding Oper,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                              ItemsSource="{Binding Path=OperationsList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellEditingTemplate>
                               <DataGridTemplateColumn.CellTemplate>
@@ -233,14 +233,14 @@
                               <DataGridTemplateColumn.CellEditingTemplate>
                                  <DataTemplate>
                                     <ComboBox IsEditable="False" 
-                                       SelectedItem="{Binding MachId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       ItemsSource="{Binding Source={x:Reference TablesListBox}, Path=SelectedItem.MachIdList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                              SelectedItem="{Binding MachId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                              ItemsSource="{Binding Source={x:Reference TablesListBox}, Path=SelectedItem.MachIdList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellEditingTemplate>
                               <DataGridTemplateColumn.CellTemplate>
                                  <DataTemplate>
                                     <TextBlock Text="{Binding Path=MachId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       HorizontalAlignment="Center"/>
+                                               HorizontalAlignment="Center"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>
@@ -253,18 +253,18 @@
                               <DataGridTemplateColumn.CellEditingTemplate>
                                  <DataTemplate>
                                     <ComboBox IsEditable="False" 
-                                       SelectedItem="{Binding Shift,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       ItemsSource="{Binding Path=ShiftList,Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                              SelectedItem="{Binding Shift,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                              ItemsSource="{Binding Path=ShiftList,Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellEditingTemplate>
                               <DataGridTemplateColumn.CellTemplate>
                                  <DataTemplate>
                                     <TextBlock Text="{Binding Path=Shift,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       HorizontalAlignment="Center"/>
+                                               HorizontalAlignment="Center"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>
-                           
+
                            <!--Colonna MachiningType-->
                            <DataGridTemplateColumn Width="0.5*">
                               <DataGridTemplateColumn.Header>
@@ -273,9 +273,9 @@
                               <DataGridTemplateColumn.CellEditingTemplate>
                                  <DataTemplate>
                                     <ComboBox IsEditable="False" 
-                                       SelectedItem="{Binding SelectedMachType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       ItemsSource="{Binding Path=MachTypeList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                                       DisplayMemberPath="TypeName"/>
+                                              SelectedItem="{Binding SelectedMachType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                              ItemsSource="{Binding Path=MachTypeList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                              DisplayMemberPath="TypeName"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellEditingTemplate>
                               <DataGridTemplateColumn.CellTemplate>
@@ -293,14 +293,14 @@
                               <DataGridTemplateColumn.CellEditingTemplate>
                                  <DataTemplate>
                                     <ComboBox IsEditable="False" 
-                                       SelectedItem="{Binding Mach, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                       ItemsSource="{Binding Path=MachList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                              SelectedItem="{Binding Mach, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                              ItemsSource="{Binding Path=MachList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellEditingTemplate>
                               <DataGridTemplateColumn.CellTemplate>
                                  <DataTemplate>
                                     <TextBlock Text="{Binding Path=Mach, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                       ToolTip="{Binding Path=Mach, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                               ToolTip="{Binding Path=Mach, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>
@@ -313,9 +313,9 @@
                               <DataGridTemplateColumn.CellEditingTemplate>
                                  <DataTemplate>
                                     <ComboBox IsEditable="False" 
-                                       SelectedItem="{Binding SelectedMachUpType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       ItemsSource="{Binding Path=MachTypeList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                                       DisplayMemberPath="TypeName"/>
+                                              SelectedItem="{Binding SelectedMachUpType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                              ItemsSource="{Binding Path=MachTypeList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                              DisplayMemberPath="TypeName"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellEditingTemplate>
                               <DataGridTemplateColumn.CellTemplate>
@@ -333,14 +333,14 @@
                               <DataGridTemplateColumn.CellEditingTemplate>
                                  <DataTemplate>
                                     <ComboBox IsEditable="False" 
-                                       SelectedItem="{Binding MachUp,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       ItemsSource="{Binding Path=MachUpList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                              SelectedItem="{Binding MachUp,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                              ItemsSource="{Binding Path=MachUpList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellEditingTemplate>
                               <DataGridTemplateColumn.CellTemplate>
                                  <DataTemplate>
                                     <TextBlock Text="{Binding Path=MachUp,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       ToolTip="{Binding Path=MachUp,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                                               ToolTip="{Binding Path=MachUp,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>
@@ -353,9 +353,9 @@
                               <DataGridTemplateColumn.CellEditingTemplate>
                                  <DataTemplate>
                                     <ComboBox IsEditable="False" 
-                                       SelectedItem="{Binding SelectedMachDownType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       ItemsSource="{Binding Path=MachTypeList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                                       DisplayMemberPath="TypeName"/>
+                                              SelectedItem="{Binding SelectedMachDownType,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                              ItemsSource="{Binding Path=MachTypeList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
+                                              DisplayMemberPath="TypeName"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellEditingTemplate>
                               <DataGridTemplateColumn.CellTemplate>
@@ -373,41 +373,41 @@
                               <DataGridTemplateColumn.CellEditingTemplate>
                                  <DataTemplate>
                                     <ComboBox IsEditable="False" 
-                                       SelectedItem="{Binding MachDw,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       ItemsSource="{Binding Path=MachDownList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
+                                              SelectedItem="{Binding MachDw,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+                                              ItemsSource="{Binding Path=MachDownList, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellEditingTemplate>
                               <DataGridTemplateColumn.CellTemplate>
                                  <DataTemplate>
                                     <TextBlock Text="{Binding Path=MachDw,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
-                                       ToolTip="{Binding Path=MachDw,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
+                                               ToolTip="{Binding Path=MachDw,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                                  </DataTemplate>
                               </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>
                         </DataGrid.Columns>
-                        
-                     </DataGrid>                     
+
+                     </DataGrid>
                   </TabItem.Content>
                </TabItem>
-               
+
                <TabItem Header="Ordered Table">
                   <TabItem.Content>
-                     
+
                      <DataGrid Name="MachiningDataGrid"
-                        ItemsSource="{Binding Path=SelectedItem.MachiningList,
+                               ItemsSource="{Binding Path=SelectedItem.MachiningList,
                                                      ElementName=MachineList}"
-                        IsSynchronizedWithCurrentItem="False"
-                        Grid.Column="2"
-                        AutoGenerateColumns="False"
-                        CanUserSortColumns="False"
-                        CanUserResizeColumns="False"
-                        CanUserResizeRows="False"
-                        CanUserReorderColumns="False"
-                        SelectionMode="Extended"
-                        ScrollViewer.CanContentScroll="True" 
-                        ScrollViewer.VerticalScrollBarVisibility="Auto"
-                        ScrollViewer.HorizontalScrollBarVisibility="Hidden"
-                        VirtualizingStackPanel.IsVirtualizing="False">
+                               IsSynchronizedWithCurrentItem="False"
+                               Grid.Column="2"
+                               AutoGenerateColumns="False"
+                               CanUserSortColumns="False"
+                               CanUserResizeColumns="False"
+                               CanUserResizeRows="False"
+                               CanUserReorderColumns="False"
+                               SelectionMode="Extended"
+                               ScrollViewer.CanContentScroll="True" 
+                               ScrollViewer.VerticalScrollBarVisibility="Auto"
+                               ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+                               VirtualizingStackPanel.IsVirtualizing="False">
                         <!--<Interactivity:Interaction.Behaviors>
                            <EgtCAM5:ScrollIntoViewForDataGrid/>
                         </Interactivity:Interaction.Behaviors>-->
@@ -533,14 +533,14 @@
                         </DataGrid.Columns>
 
                      </DataGrid>
-                     
+
                   </TabItem.Content>
                </TabItem>
 
             </TabControl>
 
          </Grid>
-         
+
          <Grid Grid.Row="3">
             <Grid.ColumnDefinitions>
                <ColumnDefinition Width="2*"/>
@@ -563,20 +563,20 @@
                   <RowDefinition Height="1.2*"/>
                </Grid.RowDefinitions>
                <TextBlock Grid.ColumnSpan="2" TextAlignment="Center" Text="Search"
-                     VerticalAlignment="Bottom"/>
+                          VerticalAlignment="Bottom"/>
                <EgtWPFLib5:EgtTextBox Text="{Binding TextToSearch,UpdateSourceTrigger=PropertyChanged}"
-                  VerticalAlignment="Center" Name="SearchTxBx" Grid.Row="1"
-                  IsExplicitFocused="{Binding Path=FocusSearchTextState,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
+                                      VerticalAlignment="Center" Name="SearchTxBx" Grid.Row="1"
+                                      IsExplicitFocused="{Binding Path=FocusSearchTextState,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}">
                   <EgtWPFLib5:EgtTextBox.InputBindings>
                      <KeyBinding Key="F3" Modifiers="Control" Command="{Binding SearchNextCommand}"/>
                      <KeyBinding Key="F3" Modifiers="Shift" Command="{Binding SearchPreviousCommand}"/>
                   </EgtWPFLib5:EgtTextBox.InputBindings>
                </EgtWPFLib5:EgtTextBox>
                <Button Grid.Column="1" Grid.Row="1"
-                  Height="{Binding ActualHeight, ElementName=SearchTxBx}"
-                  Width="{Binding Height, RelativeSource={RelativeSource Self}}"
-                  Content="X" Command="{Binding ResetSearchCommand}"
-                  IsEnabled="{Binding IsEnabledResetSearch}"/>
+                       Height="{Binding ActualHeight, ElementName=SearchTxBx}"
+                       Width="{Binding Height, RelativeSource={RelativeSource Self}}"
+                       Content="X" Command="{Binding ResetSearchCommand}"
+                       IsEnabled="{Binding IsEnabledResetSearch}"/>
             </Grid>
             <Button Content="{Binding AddMachiningBtn}" Command="{Binding AddRowCommand}"
                     CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"
@@ -603,15 +603,15 @@
                     IsEnabled="{Binding Position_IsEnabled}"
                     Grid.Column="6"/>
             <Button Content="{Binding AddMachBtn}" Command="{Binding AddMachCommand}"
-               CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"
-               Grid.Column="7"/>
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"
+                    Grid.Column="7"/>
             <Button Content="{Binding RemoveMachBtn}" Command="{Binding RemoveMachCommand}"
-               CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"
-               Grid.Column="8"/>
+                    CommandParameter="{Binding Path=SelectedItem, ElementName=TablesListBox}"
+                    Grid.Column="8"/>
          </Grid>
 
       </Grid>
 
-    </Grid>
+   </Grid>
 
 </EgtWPFLib5:EgtCustomWindow>
diff --git a/Special-GunStock/GunStockPanelV.xaml b/Special-GunStock/GunStockPanelV.xaml
index 24d5569..697668b 100644
--- a/Special-GunStock/GunStockPanelV.xaml
+++ b/Special-GunStock/GunStockPanelV.xaml
@@ -6,26 +6,26 @@
 
    <StackPanel Background="Transparent" Orientation="Horizontal">
       <Button Command="{Binding NewGunStockCommand}" Style="{StaticResource GridViewPanelButton}"
-         Width="70" Content="{Binding NewGunStockMsg}" ContextMenuService.Placement="Bottom"
-         ToolTip="{Binding NewGunStockToolTip}">
+              Width="70" Content="{Binding NewGunStockMsg}" ContextMenuService.Placement="Bottom"
+              ToolTip="{Binding NewGunStockToolTip}">
          <Button.ContextMenu>
             <ContextMenu ItemsSource="{Binding MruNewGunStockNames}"
-               ItemContainerStyle="{StaticResource MruNewGunStockItem}">
+                         ItemContainerStyle="{StaticResource MruNewGunStockItem}">
             </ContextMenu>
          </Button.ContextMenu>
       </Button>
       <Button Command="{Binding ModifyGunStockCommand}" Style="{StaticResource GridViewPanelButton}"
-         Width="70" Content="{Binding ModifyGunStockMsg}" ContextMenuService.Placement="Bottom"
-         ToolTip="{Binding ModifyGunStockToolTip}">
+              Width="70" Content="{Binding ModifyGunStockMsg}" ContextMenuService.Placement="Bottom"
+              ToolTip="{Binding ModifyGunStockToolTip}">
          <Button.ContextMenu>
             <ContextMenu ItemsSource="{Binding MruModifyGunStockNames}"
-               ItemContainerStyle="{StaticResource MruModifyGunStockItem}">
+                         ItemContainerStyle="{StaticResource MruModifyGunStockItem}">
             </ContextMenu>
          </Button.ContextMenu>
       </Button>
       <Button Command="{Binding CopyGunStockCommand}" Style="{StaticResource GridViewPanelButton}"
-         Width="70" Content="{Binding CopyGunStockMsg}" ContextMenuService.Placement="Bottom"
-         ToolTip="{Binding CopyGunStockToolTip}" Visibility="{Binding CopyGunStock_Visibility}">
+              Width="70" Content="{Binding CopyGunStockMsg}" ContextMenuService.Placement="Bottom"
+              ToolTip="{Binding CopyGunStockToolTip}" Visibility="{Binding CopyGunStock_Visibility}">
       </Button>
    </StackPanel>
 
diff --git a/Special-GunStock/GunStockWndV.xaml b/Special-GunStock/GunStockWndV.xaml
index a48efa7..ff4dc7a 100644
--- a/Special-GunStock/GunStockWndV.xaml
+++ b/Special-GunStock/GunStockWndV.xaml
@@ -1,12 +1,12 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="GunStockWndV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   Title="{Binding TitleMsg}"
-   TitleBarBrush="{StaticResource EgaltechBlue1}"
-   BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="4"
-   WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
-   IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False" SizeToContent="WidthAndHeight">
+                            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                            xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+                            Title="{Binding TitleMsg}"
+                            TitleBarBrush="{StaticResource EgaltechBlue1}"
+                            BorderBrush="{StaticResource EgaltechBlue1}" BorderThickness="4"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
+                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False" SizeToContent="WidthAndHeight">
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
       <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
@@ -27,12 +27,12 @@
          </Grid.ColumnDefinitions>
 
          <TextBlock Grid.Column="0" Text="{Binding FileNameMsg}" Margin="5,0,0,0"
-            VerticalAlignment="Center"/>
+                    VerticalAlignment="Center"/>
          <TextBox Grid.Column="1" Margin="5" Height="24" Name="FileNameTxBx"
-            Text="{Binding FileName, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource FileNameConverter}}"
-            VerticalAlignment="Center" VerticalContentAlignment="Center"/>
+                  Text="{Binding FileName, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource FileNameConverter}}"
+                  VerticalAlignment="Center" VerticalContentAlignment="Center"/>
          <TextBlock Grid.Column="1" Name="FileNameTxBl" Visibility="Hidden"
-            Text="{Binding FileName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+                    Text="{Binding FileName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
 
       </Grid>
 
@@ -43,10 +43,10 @@
          </Grid.ColumnDefinitions>
 
          <TextBlock Grid.Column="0" Text="{Binding DescriptionMsg}" Margin="5,0,0,0"
-            VerticalAlignment="Center"/>
+                    VerticalAlignment="Center"/>
          <TextBox Grid.Column="1" Margin="5" Height="24"
-            Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}"
-            VerticalAlignment="Center" VerticalContentAlignment="Center"/>
+                  Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}"
+                  VerticalAlignment="Center" VerticalContentAlignment="Center"/>
 
       </Grid>
 
@@ -65,7 +65,7 @@
                   <TextBlock Text="{Binding Name}"/>
                   <TextBox Grid.Column="1" Text="{Binding Value,UpdateSourceTrigger=PropertyChanged}"/>
                   <TextBlock Grid.Row="1" Grid.ColumnSpan="2" Style="{StaticResource ValidationErrorTextBlock}"
-                     Text="{Binding ErrorMsg}"/>
+                             Text="{Binding ErrorMsg}"/>
                </Grid>
             </DataTemplate>
          </ItemsControl.ItemTemplate>
@@ -73,10 +73,10 @@
 
       <UniformGrid Columns="2" Grid.Row="3" Margin="0,0,0,5">
          <Button IsDefault="True" Name="OkBtn" IsEnabled="{Binding IsEnabledOkBtn,Mode=OneWay}"
-            Content="{Binding OkMsg}" Style="{StaticResource EgtCAM5_InputButton}"
-            Command="{Binding OkBtnCommand}"/>
+                 Content="{Binding OkMsg}" Style="{StaticResource EgtCAM5_InputButton}"
+                 Command="{Binding OkBtnCommand}"/>
          <Button IsCancel="True"
-            Content="{Binding CancelMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
+                 Content="{Binding CancelMsg}" Style="{StaticResource EgtCAM5_InputButton}"/>
       </UniformGrid>
 
    </Grid>
diff --git a/StatusBar/StatusBarV.xaml b/StatusBar/StatusBarV.xaml
index 6c32863..6c3ab0f 100644
--- a/StatusBar/StatusBarV.xaml
+++ b/StatusBar/StatusBarV.xaml
@@ -1,12 +1,12 @@
 <UserControl x:Class="StatusBarV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
-   xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
-   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-   mc:Ignorable="d" 
-   d:DesignHeight="20" d:DesignWidth="1366">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="20" d:DesignWidth="1366">
 
    <!--StatusBar che contiene quote, barre di caricamento ed alcune impostazioni-->
    <StatusBar DockPanel.Dock="Bottom" Background="{StaticResource EgaltechBlue1}">
@@ -33,7 +33,7 @@
       </StatusBarItem>
       <StatusBarItem Grid.Column="1">
          <Button Command="{Binding StatusStopCommand}" Content="X"
-            IsEnabled="{Binding StopProgress_IsEnabled}" Width="20"/>
+                 IsEnabled="{Binding StopProgress_IsEnabled}" Width="20"/>
       </StatusBarItem>
       <StatusBarItem Grid.Column="2">
          <StatusBarItem.InputBindings>
diff --git a/TopCommandBar/TopCommandBarV.xaml b/TopCommandBar/TopCommandBarV.xaml
index dc02a08..ad784f9 100644
--- a/TopCommandBar/TopCommandBarV.xaml
+++ b/TopCommandBar/TopCommandBarV.xaml
@@ -1,7 +1,7 @@
 <StackPanel x:Class="TopCommandBarV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-   Orientation="Horizontal">
+            xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            Orientation="Horizontal">
 
    <!--Barra superiore dei comandi-->
    <UniformGrid Rows="1"
@@ -52,11 +52,11 @@
       </Button>
    </UniformGrid>
    <Button Command="{Binding OptionsCommand}" ToolTip="{Binding OptionsToolTip}"
-            IsEnabled="{Binding SaveIsEnabled}">
+           IsEnabled="{Binding SaveIsEnabled}">
       <Image Source="/Resources/TopCommandBar/Options.png" Height="22" />
    </Button>
    <Button Command="{Binding SendFeedbackCommand}" ToolTip="{Binding SendFeedbackToolTip}"
-            IsEnabled="{Binding SaveIsEnabled}">
+           IsEnabled="{Binding SaveIsEnabled}">
       <Image Source="/Resources/TopCommandBar/Send.png" Height="22" Margin="3,0,3,0" />
    </Button>
    <UniformGrid Rows="1">
diff --git a/TopTray/TopTrayV.xaml b/TopTray/TopTrayV.xaml
index 71dcaa7..c72b25d 100644
--- a/TopTray/TopTrayV.xaml
+++ b/TopTray/TopTrayV.xaml
@@ -1,17 +1,17 @@
 <WrapPanel x:Class="TopTrayV"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:EgtCAM5"
-             xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
-             DockPanel.Dock="Top"
-             Orientation="Horizontal">
-   
+           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+           xmlns:local="clr-namespace:EgtCAM5"
+           xmlns:EgtFloating="clr-namespace:EgtWPFLib5.EgtFloating;assembly=EgtWPFLib5"
+           DockPanel.Dock="Top"
+           Orientation="Horizontal">
+
    <EgtFloating:EgtFloatingPanel Name="ShowPanel"
-      IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
+                                 IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
       <local:ShowPanelV DataContext="{StaticResource ShowPanelViewModel}"/>
    </EgtFloating:EgtFloatingPanel>
    <EgtFloating:EgtFloatingPanel Name="ViewPanel"
-      IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
+                                 IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
       <local:ViewPanelV DataContext="{StaticResource ViewPanelViewModel}"/>
       <local:PopUpViewPanelV DataContext="{StaticResource PopUpViewPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
    </EgtFloating:EgtFloatingPanel>
@@ -20,7 +20,7 @@
    <local:InstrumentPanelV DataContext="{StaticResource InstrumentPanelViewModel}"/>
    <!--</EgtFloating:EgtFloatingPanel>-->
    <EgtFloating:EgtFloatingPanel Name="GridPanel"
-      IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
+                                 IsTopDockable="True" IsBottomDockable="True" IsLeftDockable="False" IsRightDockable="False">
       <local:GridPanelV DataContext="{StaticResource GridPanelViewModel}"/>
       <local:PopUpGridPanelV DataContext="{StaticResource PopUpGridPanelViewModel}" EgtFloating:EgtFloatingPanel.IsInPopUp="True"/>
    </EgtFloating:EgtFloatingPanel>
@@ -32,5 +32,5 @@
    <local:BeamWallPanelV DataContext="{StaticResource BeamWallPanelViewModel}"/>
    <local:DoorPanelV DataContext="{StaticResource DoorsPanelViewModel}"/>
    <local:GunStockPanelV DataContext="{StaticResource GunStockPanelViewModel}"/>
-   
+
 </WrapPanel>
diff --git a/ViewPanel/ViewPanelV.xaml b/ViewPanel/ViewPanelV.xaml
index 1cfb9b5..0a4ebee 100644
--- a/ViewPanel/ViewPanelV.xaml
+++ b/ViewPanel/ViewPanelV.xaml
@@ -1,6 +1,6 @@
 <UserControl x:Class="ViewPanelV"
-   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
    <StackPanel Background="Transparent" Orientation="Horizontal">
       <Button ToolTip="{Binding ZoomAllToolTip}" Style="{StaticResource GridViewPanelButton}" Command="{Binding ZoomAllCommand}">