diff --git a/Icarus/Constants/Const3dPrint.vb b/Icarus/Constants/Const3dPrint.vb
index 40c303d..163f2db 100644
--- a/Icarus/Constants/Const3dPrint.vb
+++ b/Icarus/Constants/Const3dPrint.vb
@@ -5,6 +5,7 @@
    Public Const PART = "Part"
    Public Const PRINT_SOLID = "PrintSolid"
    Public Const LAY_MACH_START = "MachStart"
+   Public Const LAY_PARTREFERENCE = "PartFrame"
    Public Const LAY_REFERENCE = "Frame"
    Public Const LAY_OTHERS = "Aux"
    Public Const LAY_RIBS = "Ribs"
@@ -117,6 +118,7 @@
    Public Const MAC_RIBSLEADOUTCOASTING = "RibsLeadOutCoasting"
    Public Const MAC_RIBSLEADOUTWIPE = "RibsLeadOutWipe"
    Public Const MAC_RIBSLEADOUTWIPEDIR = "RibsLeadOutWipeDir"
+   Public Const MAC_RIBSLIMITUNBOUNDEDWITHSOLID = "LimitUnboundedRibsWithSolid"
    Public Const MAC_SHELLNBRDIFFERENCE = "ShellNbrDifference"
    Public Const MAC_SHELLNBRCOASTING = "ShellNbrCoasting"
    Public Const MAC_SHELLNBRWIPE = "ShellNbrWipe"
diff --git a/Icarus/CurrMachiningPanel/CurrMachining.vb b/Icarus/CurrMachiningPanel/CurrMachining.vb
index 3b463c8..afe57de 100644
--- a/Icarus/CurrMachiningPanel/CurrMachining.vb
+++ b/Icarus/CurrMachiningPanel/CurrMachining.vb
@@ -248,7 +248,8 @@ Public Class CurrMachiningCathegory
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nPartId, nIndex, bForceFromDb),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nPartId, nIndex, bForceFromDb),
                                                                 New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nPartId, nIndex, bForceFromDb),
-                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb)})
+                                                                New CurrNumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nPartId, nIndex, bForceFromDb),
+                                                                New CurrCheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nPartId, nIndex, bForceFromDb)})
          Case Cathegories.SHELL_NUMBER
             m_sName = "Reduce Shell Number"
             m_MachiningParamList = New List(Of MachiningParam)({New CurrNumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nPartId, nIndex, bForceFromDb),
@@ -922,6 +923,8 @@ Public Class CurrCheckMachiningParam
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADININVERT, m_bValue)
          Case Params.RIBSLEADOUTINVERT
             bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLEADOUTINVERT, m_bValue)
+         Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
+            bReadFromPart = EgtGetInfo(nPartId, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, m_bValue)
       End Select
       m_bOrigValue = m_bValue
       If nIndex > 0 Then
@@ -929,7 +932,7 @@ Public Class CurrCheckMachiningParam
          Select Case Type
             Case Params.SPIRALVASE
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.GENERAL).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
-            Case Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, Params.RIBSINVERTSTRANDORDER, Params.RIBSLEADININVERT, Params.RIBSLEADOUTINVERT
+            Case Params.RIBSLINK, Params.RIBSINVERTORDER, Params.RIBSINVERTDIRECTION, Params.RIBSINVERTSTRANDORDER, Params.RIBSLEADININVERT, Params.RIBSLEADOUTINVERT, Params.RIBSLIMITUNBOUNDEDWITHSOLID
                m_DbParam = DbMachining.CathegoryList.FirstOrDefault(Function(y) y.Type = MachiningCathegory.Cathegories.RIBS).MachiningParamList.FirstOrDefault(Function(z) z.Type = m_Type)
          End Select
          If bForceFromDb OrElse Not bReadFromPart Then
@@ -955,6 +958,8 @@ Public Class CurrCheckMachiningParam
             EgtSetInfo(nPartId, MAC_RIBSLEADININVERT, If(m_bValue, 1, 0))
          Case Params.RIBSLEADOUTINVERT
             EgtSetInfo(nPartId, MAC_RIBSLEADOUTINVERT, If(m_bValue, 1, 0))
+         Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
+            EgtSetInfo(nPartId, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, If(m_bValue, 1, 0))
       End Select
    End Sub
 
diff --git a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
index 9edef53..3da9b78 100644
--- a/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
+++ b/Icarus/CurrMachiningPanel/CurrMachiningPanelV.xaml
@@ -210,8 +210,8 @@
                <Image Source="\Resources\Common\Cancel.png"
                       Style="{StaticResource Button_Image}"/>
             </Button>
-            <Button ToolTip="Save in Db"
-                    Command="{Binding SaveInDb_Command}"
+            <Button Command="{Binding SaveInDb_Command}"
+                    ToolTip="{Binding SaveInDb_ToolTip}"
                     Margin="0,0,2.5,0"
                     Style="{StaticResource RightPanel_HalfRound_Button}">
                <Image Source="\Resources\CurrMachining\SaveInDb.png"
diff --git a/Icarus/CurrMachiningPanel/CurrMachiningPanelVM.vb b/Icarus/CurrMachiningPanel/CurrMachiningPanelVM.vb
index 820d884..1d2f2f9 100644
--- a/Icarus/CurrMachiningPanel/CurrMachiningPanelVM.vb
+++ b/Icarus/CurrMachiningPanel/CurrMachiningPanelVM.vb
@@ -18,6 +18,16 @@ Public Class CurrMachiningPanelVM
       Map.refTopPanelVM.UpdateCurrMachining()
    End Sub
 
+#Region "Tooltip"
+
+   Public ReadOnly Property SaveInDb_ToolTip As String
+      Get
+         Return "Save in Db"
+      End Get
+   End Property
+
+#End Region    ' Tooltip
+
    ' Definizione comandi
    Private m_cmdOk As ICommand
    Private m_cmdCancel As ICommand
diff --git a/Icarus/DispositionPanel/DispositionPanelVM.vb b/Icarus/DispositionPanel/DispositionPanelVM.vb
index 2c1d57c..3321944 100644
--- a/Icarus/DispositionPanel/DispositionPanelVM.vb
+++ b/Icarus/DispositionPanel/DispositionPanelVM.vb
@@ -87,7 +87,7 @@ Public Class DispositionPanelVM
       Get
          If Not IsNothing(Map.refTopPanelVM.SelPart) Then
             Dim ptReference As New Point3d
-            EgtStartPoint(Map.refTopPanelVM.SelPart.nReferenceId, GDB_ID.ROOT, ptReference)
+            EgtStartPoint(Map.refTopPanelVM.SelPart.nPartReferenceId, GDB_ID.ROOT, ptReference)
             Return LenToString(ptReference.z, 1)
          Else
             Return ""
@@ -95,7 +95,7 @@ Public Class DispositionPanelVM
       End Get
       Set(value As String)
          Dim ptReference As New Point3d
-         EgtStartPoint(Map.refTopPanelVM.SelPart.nReferenceId, GDB_ID.ROOT, ptReference)
+         EgtStartPoint(Map.refTopPanelVM.SelPart.nPartReferenceId, GDB_ID.ROOT, ptReference)
          Dim dNewZPos As Double = ptReference.z
          StringToLen(value, dNewZPos)
          Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
@@ -118,7 +118,7 @@ Public Class DispositionPanelVM
 
    Friend Sub UpdateZPos()
       Dim ptReference As New Point3d
-      EgtStartPoint(Map.refTopPanelVM.SelPart.nReferenceId, GDB_ID.ROOT, ptReference)
+      EgtStartPoint(Map.refTopPanelVM.SelPart.nPartReferenceId, GDB_ID.ROOT, ptReference)
       Dim dNewZPos As Double = ptReference.z
       Dim b3Print As BBox3d = GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
       Dim dMin As Double = 0
diff --git a/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml b/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml
index ef181f8..7ecd2ef 100644
--- a/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml
+++ b/Icarus/FilledSolidPanel/FilledSolidPanelV.xaml
@@ -167,7 +167,7 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Command="{Binding CPlaneTop_Command}" 
-                 ToolTip="{Binding CPlaneTopToolTip}"
+                 ToolTip="{Binding CPlaneTop_ToolTip}"
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneTOP.png"
@@ -175,7 +175,7 @@
          </Button>
          <Button Grid.Column="1"
                  Command="{Binding CPlaneFront_Command}" 
-                 ToolTip="{Binding CPlaneFrontToolTip}" 
+                 ToolTip="{Binding CPlaneFront_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
@@ -183,7 +183,7 @@
          </Button>
          <Button Grid.Column="2" 
                  Command="{Binding CPlaneRight_Command}" 
-                 ToolTip="{Binding CPlaneRightToolTip}" 
+                 ToolTip="{Binding CPlaneRight_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
@@ -191,7 +191,7 @@
          </Button>
          <Button Grid.Column="3"
                  Command="{Binding CPlaneBack_Command}" 
-                 ToolTip="{Binding CPlaneBackToolTip}" 
+                 ToolTip="{Binding CPlaneBack_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneBACK.png"
@@ -199,7 +199,7 @@
          </Button>
          <Button Grid.Column="4"
                  Command="{Binding CPlaneLeft_Command}"
-                 ToolTip="{Binding CPlaneLeftToolTip}" 
+                 ToolTip="{Binding CPlaneLeft_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
@@ -207,7 +207,7 @@
          </Button>
          <Button Grid.Column="5"
                  Command="{Binding CPlaneBottom_Command}"
-                 ToolTip="{Binding CPlaneBottomToolTip}"
+                 ToolTip="{Binding CPlaneBottom_ToolTip}"
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
@@ -215,7 +215,7 @@
          </Button>
          <Button Grid.Column="6" 
                  Command="{Binding CPlaneElevation_Command}" 
-                 ToolTip="{Binding CPlaneElevationToolTip}" 
+                 ToolTip="{Binding CPlaneElevation_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
@@ -223,7 +223,7 @@
          </Button>
          <Button Grid.Column="7"
                  Command="{Binding CPlaneOrigin_Command}"
-                 ToolTip="{Binding CPlaneOriginToolTip}" 
+                 ToolTip="{Binding CPlaneOrigin_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CPlaneORIGIN.png"
@@ -231,7 +231,7 @@
          </Button>
          <Button Grid.Column="8"
                  Command="{Binding CPlaneObj_Command}"
-                 ToolTip="{Binding CPlaneObjToolTip}" 
+                 ToolTip="{Binding CPlaneObj_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
diff --git a/Icarus/FilledSolidPanel/FilledSolidPanelVM.vb b/Icarus/FilledSolidPanel/FilledSolidPanelVM.vb
index 08d2cc3..e05d83c 100644
--- a/Icarus/FilledSolidPanel/FilledSolidPanelVM.vb
+++ b/Icarus/FilledSolidPanel/FilledSolidPanelVM.vb
@@ -388,6 +388,111 @@ Public Class FilledSolidPanelVM
       End Get
    End Property
 
+#Region "Tooltip"
+
+   Public ReadOnly Property Import_ToolTip As String
+      Get
+         Return "Import"
+      End Get
+   End Property
+
+   Public ReadOnly Property Point_ToolTip As String
+      Get
+         Return "Point"
+      End Get
+   End Property
+
+   Public ReadOnly Property Line2P_ToolTip As String
+      Get
+         Return "Multiline"
+      End Get
+   End Property
+
+   Public ReadOnly Property Delete_ToolTip As String
+      Get
+         Return "Delete"
+      End Get
+   End Property
+
+   Public ReadOnly Property ModifyCurve_ToolTip As String
+      Get
+         Return "Modify Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property AddPointCurve_ToolTip As String
+      Get
+         Return "Add Point to Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property RemovePointCurve_ToolTip As String
+      Get
+         Return "Remove Point From Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property Extrude_ToolTip As String
+      Get
+         Return "Modify Extrusion"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneTop_ToolTip As String
+      Get
+         Return "Grid From Top"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneFront_ToolTip As String
+      Get
+         Return "Grid From Front"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneRight_ToolTip As String
+      Get
+         Return "Grid From Right"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneBack_ToolTip As String
+      Get
+         Return "Grid From Back"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneLeft_ToolTip As String
+      Get
+         Return "Grid From Left"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneBottom_ToolTip As String
+      Get
+         Return "Grid From Bottom"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneElevation_ToolTip As String
+      Get
+         Return "Grid Elevation"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneOrigin_ToolTip As String
+      Get
+         Return "Grid Origin"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneObj_ToolTip As String
+      Get
+         Return "Grid On Object"
+      End Get
+   End Property
+
+#End Region    ' Tooltip
 
    ' Definizione comandi
    Private m_cmdImport As ICommand
@@ -772,6 +877,8 @@ Public Class FilledSolidPanelVM
             SelFilledSolid = m_FilledSolidList(m_FilledSolidList.Count - 1)
          Else
             SelFilledSolid = Nothing
+            m_bEdit_IsChecked = False
+            NotifyPropertyChanged(NameOf( bEdit_IsChecked))
          End If
          NotifyPropertyChanged(NameOf(SelFilledSolid))
       End If
diff --git a/Icarus/Icarus.vbproj b/Icarus/Icarus.vbproj
index 04514b9..13eb6c3 100644
--- a/Icarus/Icarus.vbproj
+++ b/Icarus/Icarus.vbproj
@@ -799,6 +799,9 @@
   <ItemGroup>
     <Resource Include="Resources\Common\Restore.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\SliceManager\StopCalculation.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\Icarus\IcarusR32.exe
diff --git a/Icarus/ImportExportMachiningPanel/ImportExportMachiningPanelVM.vb b/Icarus/ImportExportMachiningPanel/ImportExportMachiningPanelVM.vb
index d679f5d..6c950c2 100644
--- a/Icarus/ImportExportMachiningPanel/ImportExportMachiningPanelVM.vb
+++ b/Icarus/ImportExportMachiningPanel/ImportExportMachiningPanelVM.vb
@@ -264,7 +264,7 @@ Public Class ImportExportMachiningPanelVM
       Select Case m_WindowType
          Case WindowTypeEnum.MATERIAL
             Return Map.refMaterialDbVM.MaterialList.Any(Function(x) x.sName = MachiningName)
-         Case WindowTypeEnum.MACHINING
+         Case Else  ' WindowTypeEnum.MACHINING
             Return Map.refMachiningDbVM.MachiningList.Any(Function(x) x.sName = MachiningName)
       End Select
    End Function
diff --git a/Icarus/InstrumentPanel/InstrumentPanelV.xaml b/Icarus/InstrumentPanel/InstrumentPanelV.xaml
index 4eda202..eeaf3c3 100644
--- a/Icarus/InstrumentPanel/InstrumentPanelV.xaml
+++ b/Icarus/InstrumentPanel/InstrumentPanelV.xaml
@@ -5,7 +5,7 @@
             xmlns:local="clr-namespace:Icarus"
             Orientation="Horizontal">
 
-   <local:CheckedImageToggleButton ToolTip="{Binding GetDistToolTip}"
+   <local:CheckedImageToggleButton ToolTip="{Binding GetDist_ToolTip}"
                                    IsChecked="{Binding GetDistIsChecked}"
                                    ImageSource="/Resources/InstrumentPanel/GetDist.png"
                                    CheckedImageSource="/Resources/InstrumentPanel/GetDist_White.png"
@@ -17,7 +17,7 @@
          <sys:Double x:Key="ToggleButton.Image.Width">25</sys:Double>
       </local:CheckedImageToggleButton.Resources>
    </local:CheckedImageToggleButton>
-   <local:CheckedImageToggleButton ToolTip="{Binding EdgeAnalysisToolTip}"
+   <local:CheckedImageToggleButton ToolTip="{Binding EdgeAnalysis_ToolTip}"
                                    IsChecked="{Binding bEdgeAnalysis_IsChecked}"
                                    IsEnabled="{Binding bEdgeAnalysis_IsEnabled}"
                                    ImageSource="/Resources/InstrumentPanel/EdgeAnalysis.png"
diff --git a/Icarus/InstrumentPanel/MyInstrumentPanelVM.vb b/Icarus/InstrumentPanel/MyInstrumentPanelVM.vb
index 2b2def1..2aae8bd 100644
--- a/Icarus/InstrumentPanel/MyInstrumentPanelVM.vb
+++ b/Icarus/InstrumentPanel/MyInstrumentPanelVM.vb
@@ -139,6 +139,22 @@ Public Class MyInstrumentPanelVM
       NotifyPropertyChanged(NameOf(bEdgeAnalysis_IsEnabled))
    End Sub
 
+#Region "Tooltip"
+
+   Public ReadOnly Property GetDist_ToolTip As String
+      Get
+         Return "Distance"
+      End Get
+   End Property
+
+   Public ReadOnly Property EdgeAnalysis_ToolTip As String
+      Get
+         Return "Edge Analysis"
+      End Get
+   End Property
+
+#End Region    ' Tooltip
+
 #Region "CONSTRUCTORS"
 
    Sub New()
diff --git a/Icarus/MachiningDb/Machining.vb b/Icarus/MachiningDb/Machining.vb
index c375813..9707b47 100644
--- a/Icarus/MachiningDb/Machining.vb
+++ b/Icarus/MachiningDb/Machining.vb
@@ -363,7 +363,8 @@ Public Class MachiningCathegory
                                                                 New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTLEN, nIndex),
                                                                 New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTCOASTING, nIndex),
                                                                 New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPE, nIndex),
-                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nIndex)})
+                                                                New NumericMachiningParam(MachiningParam.Params.RIBSLEADOUTWIPEDIR, nIndex),
+                                                                New CheckMachiningParam(MachiningParam.Params.RIBSLIMITUNBOUNDEDWITHSOLID, nIndex)})
          Case Cathegories.SHELL_NUMBER
             m_sName = "Reduce Shell Number"
             m_MachiningParamList = New List(Of MachiningParam)({New NumericMachiningParam(MachiningParam.Params.SHELLNBRDIFFERENCE, nIndex),
@@ -420,67 +421,67 @@ Public MustInherit Class MachiningParam
    Inherits VMBase
 
    Public Enum Params As Integer
-      NAME = 2
-      SLICINGTYPE = 3
-      STRANDH = 4
-      STRANDW = 5
-      STRANDCOUNT = 6
-      OFFSET = 7
+      SLICINGTYPE = 1
+      SPIRALVASE = 2
+      STRANDH = 3
+      STRANDW = 4
+      STRANDCOUNT = 5
+      OFFSET = 6
+      STRANDOVERLAP = 7
       STARTPOINTOFFSETONSLICE = 8
       STRANDORDER = 9
       DIRECTION = 10
-      LINKTYPE = 11
-      LINKPARAM = 12
-      LINKZUP = 13
-      OFFSETLEADPOINT = 14
-      LEADIN = 15
-      LEADINTANGDIST = 16
-      LEADINORTHODIST = 17
-      LEADOUT = 18
-      LEADOUTTANGDIST = 19
-      LEADOUTORTHODIST = 20
-      COASTINGLEN = 21
-      COASTINGFEED_PC = 22
-      WIPELEN = 23
-      WIPEFEED_PC = 24
-      FLOORCOUNT = 25
-      G0FEED = 26
-      G0FEEDZ = 27
-      TOOLDIAM = 28
-      RIBSTYPE = 29
-      RIBSOVERLAP = 30
-      RIBSSTRANDCOUNT = 31
-      RIBSLINK = 32
-      RIBSINVERTORDER = 33
-      RIBSINVERTDIRECTION = 34
-      RIBSLEADININVERT = 35
-      RIBSLEADINLEN = 36
-      RIBSLEADOUTINVERT = 37
-      RIBSLEADOUTLEN = 38
-      RIBSLEADOUTCOASTING = 39
-      RIBSLEADOUTWIPE = 40
-      RIBSLEADOUTWIPEDIR = 41
-      SHELLNBRDIFFERENCE = 42
-      SHELLNBRCOASTING = 43
-      SHELLNBRWIPE = 44
-      SHELLNBRWIPEDIR = 45
-      AUXSOLIDSOVERLAP = 46
-      AUXSOLIDSINFILL = 47
-      AUXSOLIDSSTRANDORDER = 48
-      AUXSOLIDSLINKTYPE = 49
-      AUXSOLIDSLINKPARAM = 50
-      AUXSOLIDSSTARTPOINTOFFSETONSLICE = 51
-      AUXSOLIDSCOASTINGLEN = 52
-      AUXSOLIDSWIPELEN = 53
-      AUXSOLIDSWIPEDIR = 54
-      SPIRALVASE = 55
-      'WIPEDIR = 56
-      STRANDOVERLAP = 57
-      FLOWRATE_PC = 58
-      DYNAMIC_MODE = 59
-      PRINT_ORDER = 60
-      RIBSINVERTSTRANDORDER = 61
-      MATERIALS = 100
+      FLOORCOUNT = 11
+      G0FEED = 12
+      G0FEEDZ = 13
+      TOOLDIAM = 14
+      FLOWRATE_PC = 15
+      DYNAMIC_MODE = 16
+      PRINT_ORDER = 17
+      LINKTYPE = 51
+      LINKPARAM = 52
+      LINKZUP = 53
+      LEADIN = 54
+      LEADINTANGDIST = 55
+      LEADINORTHODIST = 56
+      OFFSETLEADPOINT = 57
+      LEADOUT = 58
+      LEADOUTTANGDIST = 59
+      LEADOUTORTHODIST = 60
+      COASTINGLEN = 61
+      COASTINGFEED_PC = 62
+      WIPELEN = 63
+      WIPEFEED_PC = 64
+      'WIPEDIR = 65
+      RIBSTYPE = 101
+      RIBSOVERLAP = 102
+      RIBSSTRANDCOUNT = 103
+      RIBSLINK = 104
+      RIBSINVERTORDER = 105
+      RIBSINVERTDIRECTION = 106
+      RIBSINVERTSTRANDORDER = 107
+      RIBSLEADININVERT = 108
+      RIBSLEADINLEN = 109
+      RIBSLEADOUTINVERT = 110
+      RIBSLEADOUTLEN = 111
+      RIBSLEADOUTCOASTING = 112
+      RIBSLEADOUTWIPE = 113
+      RIBSLEADOUTWIPEDIR = 114
+      RIBSLIMITUNBOUNDEDWITHSOLID = 115
+      SHELLNBRDIFFERENCE = 151
+      SHELLNBRCOASTING = 152
+      SHELLNBRWIPE = 153
+      SHELLNBRWIPEDIR = 154
+      AUXSOLIDSOVERLAP = 201
+      AUXSOLIDSINFILL = 202
+      AUXSOLIDSSTRANDORDER = 203
+      AUXSOLIDSLINKTYPE = 204
+      AUXSOLIDSLINKPARAM = 205
+      AUXSOLIDSSTARTPOINTOFFSETONSLICE = 206
+      AUXSOLIDSCOASTINGLEN = 207
+      AUXSOLIDSWIPELEN = 208
+      AUXSOLIDSWIPEDIR = 209
+      MATERIALS = 250
    End Enum
 
    Protected m_Type As Params
@@ -582,6 +583,8 @@ Public MustInherit Class MachiningParam
             m_sName = "Lead Out Wipe"
          Case Params.RIBSLEADOUTWIPEDIR
             m_sName = "Lead Out Wipe Dir [deg]"
+         Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
+            m_sName = "Limit Unbounded With Solid"
          Case Params.SHELLNBRDIFFERENCE
             m_sName = "Difference"
          Case Params.SHELLNBRCOASTING
@@ -1168,6 +1171,8 @@ Public Class CheckMachiningParam
                m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADININVERT, 0)
             Case Params.RIBSLEADOUTINVERT
                m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLEADOUTINVERT, 0)
+            Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
+               m_bValue = ReadMachiningParamDouble(nIndex, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, 0)
          End Select
       End If
       m_bOrigValue = m_bValue
@@ -1189,6 +1194,8 @@ Public Class CheckMachiningParam
             WriteMachiningParam(nIndex, MAC_RIBSLEADININVERT, If(m_bValue, 1, 0), sFilePath)
          Case Params.RIBSLEADOUTINVERT
             WriteMachiningParam(nIndex, MAC_RIBSLEADOUTINVERT, If(m_bValue, 1, 0), sFilePath)
+         Case Params.RIBSLIMITUNBOUNDEDWITHSOLID
+            WriteMachiningParam(nIndex, MAC_RIBSLIMITUNBOUNDEDWITHSOLID, If(m_bValue, 1, 0), sFilePath)
       End Select
    End Sub
 
diff --git a/Icarus/MachiningDb/MachiningDbV.xaml b/Icarus/MachiningDb/MachiningDbV.xaml
index c58ef38..c63a231 100644
--- a/Icarus/MachiningDb/MachiningDbV.xaml
+++ b/Icarus/MachiningDb/MachiningDbV.xaml
@@ -53,7 +53,7 @@
                     Style="{StaticResource RightPanel_Button}"/>
             <Button Grid.Column="3"
                     Command="{Binding Import_Command}"
-                    ToolTip="{Binding ImportToolTip}"
+                    ToolTip="{Binding Import_ToolTip}"
                     IsEnabled="{Binding ImpExp_IsEnabled}"
                     Margin="2.5,0,2.5,0"
                     Style="{StaticResource ToolBar_Button}">
@@ -62,7 +62,7 @@
             </Button>
             <Button Grid.Column="4"
                     Command="{Binding Export_Command}"
-                    ToolTip="{Binding ImportToolTip}"
+                    ToolTip="{Binding Export_ToolTip}"
                     IsEnabled="{Binding ImpExp_IsEnabled}"
                     Margin="2.5,0,2.5,0"
                     Style="{StaticResource ToolBar_Button}">
@@ -92,6 +92,7 @@
                                     Style="{StaticResource OptionTextBox2}"/>
             <Button Grid.Column="1"
                     Command="{Binding EditName_Command}"
+                    ToolTip="{Binding EditName_ToolTip}"
                     Margin="2.5,0,2.5,0"
                     Style="{StaticResource ToolBar_Button}">
                <Image Source="/Resources/MachiningDB/Edit.png"
diff --git a/Icarus/MachiningDb/MachiningDbVM.vb b/Icarus/MachiningDb/MachiningDbVM.vb
index b618599..d7338f9 100644
--- a/Icarus/MachiningDb/MachiningDbVM.vb
+++ b/Icarus/MachiningDb/MachiningDbVM.vb
@@ -112,6 +112,28 @@ Public Class MachiningDbVM
       End Get
    End Property
 
+#Region "Tooltip"
+
+   Public ReadOnly Property Import_ToolTip As String
+      Get
+         Return "Import"
+      End Get
+   End Property
+
+   Public ReadOnly Property Export_ToolTip As String
+      Get
+         Return "Export"
+      End Get
+   End Property
+
+   Public ReadOnly Property EditName_ToolTip As String
+      Get
+         Return "Edit Name"
+      End Get
+   End Property
+
+#End Region    ' Tooltip
+
    ' Definizione comandi
    Private m_cmdOk As ICommand
    Private m_cmdNew As ICommand
diff --git a/Icarus/ManagePartPanel/ManagePartPanelVM.vb b/Icarus/ManagePartPanel/ManagePartPanelVM.vb
index 388f587..4758342 100644
--- a/Icarus/ManagePartPanel/ManagePartPanelVM.vb
+++ b/Icarus/ManagePartPanel/ManagePartPanelVM.vb
@@ -316,8 +316,9 @@ Public Class ManagePartPanelVM
                               EgtRelocateGlob(PrintSolidEntity.nId, nPrintPartLayerId, GDB_POS.LAST_SON)
                               ' calcolo box superficie per creazione riferimento
                               EgtGetBBoxGlob(PrintSolidEntity.nId, GDB_BB.STANDARD, b3PrintSolid)
-                              ' elimino colore entita'
+                              ' elimino colore entita' e rendo visibile
                               EgtResetColor(PrintSolidEntity.nId)
+                              EgtSetStatus(PrintSolidEntity.nId, GDB_ST.ON_)
                               If PrintSolidEntity.sName <> PrintSolidEntity.nId.ToString() Then
                                  EgtSetInfo(PrintSolidEntity.nId, ENTITY_NAME, PrintSolidEntity.sName)
                               End If
@@ -341,8 +342,9 @@ Public Class ManagePartPanelVM
                                        nMachStartId = EgtCreateCurveCompo(nMachStartLayerId, PartManager_GeomEntity.nId, True)
                                  End Select
                                  EgtSetName(nMachStartId, START_GEOM)
-                                 ' elimino colore entita'
+                                 ' elimino colore entita' e rendo visibile
                                  EgtResetColor(nMachStartId)
+                                 EgtSetStatus(nMachStartId, GDB_ST.ON_)
                                  If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                     EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                                  End If
@@ -352,8 +354,9 @@ Public Class ManagePartPanelVM
                               Dim ptStart As Point3d = b3PrintSolid.Center() - 0.6 * b3PrintSolid.DimY() * Vector3d.Y_AX() - 0.5 * b3PrintSolid.DimZ() * Vector3d.Z_AX()
                               nMachStartId = EgtCreateGeoPoint(nMachStartLayerId, ptStart, GDB_RT.GLOB)
                               EgtSetName(nMachStartId, START_GEOM)
-                              ' elimino colore entita'
+                              ' elimino colore entita' e rendo visibile
                               EgtResetColor(nMachStartId)
+                              EgtSetStatus(nMachStartId, GDB_ST.ON_)
                            End If
                         Case ManagePart_Layer.LayerType.RIBS
                            nRibsLayerId = EgtCreateGroup(nPartId)
@@ -364,8 +367,9 @@ Public Class ManagePartPanelVM
                               EgtSetInfo(PartManager_GeomEntity.nId, KEY_RIB_TYPE, RibEntity.RibTypes.FROMIMPORT)
                               EgtSetInfo(PartManager_GeomEntity.nId, RIB_ID, nRibsIndex)
                               EgtRelocateGlob(PartManager_GeomEntity.nId, nRibsLayerId, GDB_POS.LAST_SON)
-                              ' elimino colore entita'
+                              ' elimino colore entita' e rendo visibile
                               EgtResetColor(PartManager_GeomEntity.nId)
+                              EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                               If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                  EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                               End If
@@ -380,8 +384,9 @@ Public Class ManagePartPanelVM
                               EgtSetInfo(PartManager_GeomEntity.nId, KEY_SHELLNBR_TYPE, ShellNumberEntity.ShellNumberTypes.FROMIMPORT)
                               EgtSetInfo(PartManager_GeomEntity.nId, SHELLNUMBER_ID, nShellNumberIndex)
                               EgtRelocateGlob(PartManager_GeomEntity.nId, nShellNumberLayerId, GDB_POS.LAST_SON)
-                              ' elimino colore entita'
+                              ' elimino colore entita' e rendo visibile
                               EgtResetColor(PartManager_GeomEntity.nId)
+                              EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                               If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                  EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                               End If
@@ -396,8 +401,9 @@ Public Class ManagePartPanelVM
                               EgtSetInfo(PartManager_GeomEntity.nId, KEY_AUXSOLID_TYPE, RibEntity.RibTypes.FROMIMPORT)
                               EgtSetInfo(PartManager_GeomEntity.nId, FILLEDSOLID_ID, nFilledSolidIndex)
                               EgtRelocateGlob(PartManager_GeomEntity.nId, nAuxSolidsLayerId, GDB_POS.LAST_SON)
-                              ' elimino colore entita'
+                              ' elimino colore entita' e rendo visibile
                               EgtResetColor(PartManager_GeomEntity.nId)
+                              EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                               If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                  EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                               End If
@@ -409,8 +415,9 @@ Public Class ManagePartPanelVM
                            EgtSetColor(nOthersLayerId, GeomEntityColors.c3Others)
                            For Each PartManager_GeomEntity In ManagePart_Layer.EntityList
                               EgtRelocateGlob(PartManager_GeomEntity.nId, nOthersLayerId, GDB_POS.LAST_SON)
-                              ' elimino colore entita'
+                              ' elimino colore entita' e rendo visibile
                               EgtResetColor(PartManager_GeomEntity.nId)
+                              EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                               If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                  EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                               End If
@@ -423,16 +430,18 @@ Public Class ManagePartPanelVM
                                     Case GDB_TY.CRV_ARC, GDB_TY.CRV_BEZ, GDB_TY.CRV_LINE
                                        '  la trasformo in curva compo
                                        Dim nOtherId As Integer = EgtCreateCurveCompo(nOthersLayerId, PartManager_GeomEntity.nId, True)
-                                       ' elimino colore entita'
+                                       ' elimino colore entita' e rendo visibile
                                        EgtResetColor(PartManager_GeomEntity.nId)
+                                       EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                                        If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                           EgtSetInfo(nOtherId, ENTITY_NAME, PartManager_GeomEntity.sName)
                                        End If
                                     Case Else
                                        ' altrimenti la sposto solamente
                                        EgtRelocateGlob(PartManager_GeomEntity.nId, nOthersLayerId, GDB_POS.LAST_SON)
-                                       ' elimino colore entita'
+                                       ' elimino colore entita' e rendo visibile
                                        EgtResetColor(PartManager_GeomEntity.nId)
+                                       EgtSetStatus(PartManager_GeomEntity.nId, GDB_ST.ON_)
                                        If PartManager_GeomEntity.sName <> PartManager_GeomEntity.nId.ToString() Then
                                           EgtSetInfo(PartManager_GeomEntity.nId, ENTITY_NAME, PartManager_GeomEntity.sName)
                                        End If
@@ -442,6 +451,8 @@ Public Class ManagePartPanelVM
                      End Select
                   Next
                   ' aggiungo layer riferimento
+                  Dim nPartReferenceLayerId As Integer = EgtCreateGroup(nPartId)
+                  EgtSetName(nPartReferenceLayerId, LAY_PARTREFERENCE)
                   Dim nReferenceLayerId As Integer = EgtCreateGroup(nPartId)
                   EgtSetName(nReferenceLayerId, LAY_REFERENCE)
                   EgtSetInfo(nReferenceLayerId, KEY_REFERENCE, ReferenceBtn.References.BL)
@@ -453,7 +464,7 @@ Public Class ManagePartPanelVM
                   EgtSetInfo(nPartId, FILE_PATH, sFilePath)
                   EgtSetInfo(nPartId, PART_NAME, ManagePart_Part.sName)
                   EgtSetInfo(nPartId, "PartOnTable", 1)
-                  Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
+                  Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, nPartReferenceLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
                   Map.refTopPanelVM.PartList.Add(NewPart)
                   ' aggiorno riferimento
                   Map.refReferencePanelVM.UpdateFramePosition(NewPart)
diff --git a/Icarus/ManagePartPanel/ManagePartUtility.vb b/Icarus/ManagePartPanel/ManagePartUtility.vb
index cb96f95..a2677e3 100644
--- a/Icarus/ManagePartPanel/ManagePartUtility.vb
+++ b/Icarus/ManagePartPanel/ManagePartUtility.vb
@@ -646,7 +646,9 @@ Public Class GeomEntity_MenuItem
             ' aggiorno riferimenti nel context menu item
             Map.refManagePartPanelVM.UpdateAllEntityContextMenu()
             ' Imposto flag di ricalcolo slice
-            EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+            If Map.refManagePartPanelVM.Type = ManagePartPanelVM.ManagePartType.MODIFY Then
+               EgtSetInfo(Map.refTopPanelVM.SelPart.nPartId, MAC_TORECALC_SLICE, True)
+            End If
          End If
          Return
       ElseIf m_Type = ManagePart_Layer.LayerType.NEWPART Then
@@ -718,6 +720,8 @@ Public Class GeomEntity_MenuItem
                EgtSetName(nOthersLayerId, LAY_OTHERS)
                EgtSetColor(nOthersLayerId, GeomEntityColors.c3Others)
                ' aggiungo riferimento
+               Dim nPartReferenceLayerId As Integer = EgtCreateGroup(nPartId)
+               EgtSetName(nPartReferenceLayerId, LAY_PARTREFERENCE)
                Dim nReferenceLayerId As Integer = EgtCreateGroup(nPartId)
                EgtSetName(nReferenceLayerId, LAY_REFERENCE)
                EgtSetInfo(nReferenceLayerId, KEY_REFERENCE, ReferenceBtn.References.BL)
@@ -726,7 +730,7 @@ Public Class GeomEntity_MenuItem
                ' lo aggiungo a lista pezzi 
                EgtSetInfo(nPartId, FILE_PATH, sFilePath)
                EgtSetInfo(nPartId, "PartOnTable", 1)
-               Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
+               Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, nPartReferenceLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
                Map.refTopPanelVM.PartList.Add(NewPart)
                ' aggiorno riferimento
                Map.refReferencePanelVM.UpdateFramePosition(NewPart)
@@ -773,7 +777,7 @@ Public Class GeomEntity_MenuItem
                End If
             End If
             ' aggiorno riferimenti nel context menu item
-            m_OrigEntity.UpdateContextMenu()
+            Map.refManagePartPanelVM.UpdateAllEntityContextMenu()
          Case ManagePartPanelVM.ManagePartType.MODIFY
             Dim bIsMovedPartOrRib As Boolean = False
             ' recupero layer da pezzo
diff --git a/Icarus/MaterialDb/MaterialDbV.xaml b/Icarus/MaterialDb/MaterialDbV.xaml
index e4c146c..40cf3cb 100644
--- a/Icarus/MaterialDb/MaterialDbV.xaml
+++ b/Icarus/MaterialDb/MaterialDbV.xaml
@@ -52,7 +52,7 @@
                     Style="{StaticResource RightPanel_Button}"/>
             <Button Grid.Column="3"
                     Command="{Binding Import_Command}"
-                    ToolTip="{Binding ImportToolTip}"
+                    ToolTip="{Binding Import_ToolTip}"
                     IsEnabled="{Binding ImpExp_IsEnabled}"
                     Margin="2.5,0,2.5,0"
                     Style="{StaticResource ToolBar_Button}">
@@ -61,7 +61,7 @@
             </Button>
             <Button Grid.Column="4"
                     Command="{Binding Export_Command}"
-                    ToolTip="{Binding ImportToolTip}"
+                    ToolTip="{Binding Export_ToolTip}"
                     IsEnabled="{Binding ImpExp_IsEnabled}"
                     Margin="2.5,0,2.5,0"
                     Style="{StaticResource ToolBar_Button}">
@@ -91,6 +91,7 @@
                                     Style="{StaticResource OptionTextBox2}"/>
             <Button Grid.Column="1"
                     Command="{Binding EditName_Command}"
+                    ToolTip="{Binding EditName_ToolTip}"
                     Margin="2.5,0,2.5,0"
                     Style="{StaticResource ToolBar_Button}">
                <Image Source="/Resources/MaterialDB/Edit.png"/>
diff --git a/Icarus/MaterialDb/MaterialDbVM.vb b/Icarus/MaterialDb/MaterialDbVM.vb
index 4b75250..330de52 100644
--- a/Icarus/MaterialDb/MaterialDbVM.vb
+++ b/Icarus/MaterialDb/MaterialDbVM.vb
@@ -128,6 +128,28 @@ Public Class MaterialDbVM
       End Get
    End Property
 
+#Region "Tooltip"
+
+   Public ReadOnly Property Import_ToolTip As String
+      Get
+         Return "Import"
+      End Get
+   End Property
+
+   Public ReadOnly Property Export_ToolTip As String
+      Get
+         Return "Export"
+      End Get
+   End Property
+
+   Public ReadOnly Property EditName_ToolTip As String
+      Get
+         Return "Edit Name"
+      End Get
+   End Property
+
+#End Region    ' Tooltip
+
    ' Definizione comandi
    Private m_cmdOk As ICommand
    Private m_cmdCopy As ICommand
diff --git a/Icarus/My Project/AssemblyInfo.vb b/Icarus/My Project/AssemblyInfo.vb
index d97e750..c108264 100644
--- a/Icarus/My Project/AssemblyInfo.vb	
+++ b/Icarus/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.2.2")>
-<Assembly: AssemblyFileVersion("2.5.2.2")>
+<Assembly: AssemblyVersion("2.5.3.1")>
+<Assembly: AssemblyFileVersion("2.5.3.1")>
diff --git a/Icarus/OptionsWindow/OptionWindowVM.vb b/Icarus/OptionsWindow/OptionWindowVM.vb
index 11d122b..2861885 100644
--- a/Icarus/OptionsWindow/OptionWindowVM.vb
+++ b/Icarus/OptionsWindow/OptionWindowVM.vb
@@ -1134,7 +1134,7 @@ Public Class OptionWindowVM
             ' aggiungo i file della Macchina
             Dim sMachineDir As String = Map.refMainWindowVM.MainWindowM.sMachinesRoot & "\" & sCurrMachineName
             If Directory.Exists(sMachineDir) Then
-               zip.AddItem(sMachineDir, sCurrMachineName)
+               zip.AddSelectedFiles( "name != *\.git\*.* and name != *.git*", sMachineDir, sCurrMachineName, True)
             End If
             ' salvo lo zip
             zip.Save()
diff --git a/Icarus/ProjManager/ProjManagerVM.vb b/Icarus/ProjManager/ProjManagerVM.vb
index 8458854..388ef98 100644
--- a/Icarus/ProjManager/ProjManagerVM.vb
+++ b/Icarus/ProjManager/ProjManagerVM.vb
@@ -88,34 +88,24 @@ Public Class ProjManagerVM
          Return EgtMsg(MSG_TOPCOMMANDBAR + 4)
       End Get
    End Property
-   Public ReadOnly Property InsertToolTip As String
+   Public ReadOnly Property ImportToolTip As String
       Get
-         Return EgtMsg(MSG_TOPCOMMANDBAR + 5)
+         Return "Import"
       End Get
    End Property
-   Public ReadOnly Property ImportBTL_ToolTip As String
+   Public ReadOnly Property ExportToolTip As String
       Get
-         Return EgtMsg(61840)
+         Return "Export"
       End Get
    End Property
-   Public ReadOnly Property UpdateBTL_ToolTip As String
+   Public ReadOnly Property OptionsToolTip As String
       Get
-         Return EgtMsg(61834)
+         Return "Options"
       End Get
    End Property
-   Public ReadOnly Property ExportProject_ToolTip As String
+   Public ReadOnly Property SendFeedbackToolTip As String
       Get
-         Return EgtMsg(61838)
-      End Get
-   End Property
-   Public ReadOnly Property ImportProject_ToolTip As String
-      Get
-         Return EgtMsg(61839)
-      End Get
-   End Property
-   Public ReadOnly Property GoToProd_ToolTip As String
-      Get
-         Return EgtMsg(61835)
+         Return "Send Feedback"
       End Get
    End Property
 
diff --git a/Icarus/ReferencePanel/ReferencePanelVM.vb b/Icarus/ReferencePanel/ReferencePanelVM.vb
index a6cd4de..e095825 100644
--- a/Icarus/ReferencePanel/ReferencePanelVM.vb
+++ b/Icarus/ReferencePanel/ReferencePanelVM.vb
@@ -115,6 +115,10 @@ Public Class ReferencePanelVM
          ElseIf EgtGetInfo(SelPart.nPartId, KEY_MOVEDPART2, vtMovedPart) Then
             ptOrig = ptOrig - vtMovedPart
          End If
+         Dim nPartFrameId As Integer = EgtCreateGeoFrame(SelPart.nPartReferenceLayerId, New Frame3d(ptOrig), GDB_RT.GLOB)
+         EgtSetStatus(nPartFrameId, GDB_ST.OFF)
+         ' elimino componente Z
+         ptOrig = ptOrig + New Vector3d(0, 0, -ptOrig.z)
          frPrintSolid = New Frame3d(ptOrig)
       End If
       Dim nFrameId As Integer = EgtCreateGeoFrame(SelPart.nReferenceLayerId, frPrintSolid, GDB_RT.GLOB)
diff --git a/Icarus/Resources/SliceManager/StopCalculation.png b/Icarus/Resources/SliceManager/StopCalculation.png
new file mode 100644
index 0000000..5818a89
Binary files /dev/null and b/Icarus/Resources/SliceManager/StopCalculation.png differ
diff --git a/Icarus/RibPanel/RibPanelV.xaml b/Icarus/RibPanel/RibPanelV.xaml
index 29d134d..ff74256 100644
--- a/Icarus/RibPanel/RibPanelV.xaml
+++ b/Icarus/RibPanel/RibPanelV.xaml
@@ -167,7 +167,7 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Command="{Binding CPlaneTop_Command}" 
-                 ToolTip="{Binding CPlaneTopToolTip}"
+                 ToolTip="{Binding CPlaneTop_ToolTip}"
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneTOP.png"
@@ -175,7 +175,7 @@
          </Button>
          <Button Grid.Column="1"
                  Command="{Binding CPlaneFront_Command}" 
-                 ToolTip="{Binding CPlaneFrontToolTip}" 
+                 ToolTip="{Binding CPlaneFront_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
@@ -183,7 +183,7 @@
          </Button>
          <Button Grid.Column="2" 
                  Command="{Binding CPlaneRight_Command}" 
-                 ToolTip="{Binding CPlaneRightToolTip}" 
+                 ToolTip="{Binding CPlaneRight_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
@@ -191,7 +191,7 @@
          </Button>
          <Button Grid.Column="3"
                  Command="{Binding CPlaneBack_Command}" 
-                 ToolTip="{Binding CPlaneBackToolTip}" 
+                 ToolTip="{Binding CPlaneBack_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneBACK.png"
@@ -199,7 +199,7 @@
          </Button>
          <Button Grid.Column="4"
                  Command="{Binding CPlaneLeft_Command}"
-                 ToolTip="{Binding CPlaneLeftToolTip}" 
+                 ToolTip="{Binding CPlaneLeft_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
@@ -207,7 +207,7 @@
          </Button>
          <Button Grid.Column="5"
                  Command="{Binding CPlaneBottom_Command}"
-                 ToolTip="{Binding CPlaneBottomToolTip}"
+                 ToolTip="{Binding CPlaneBottom_ToolTip}"
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
@@ -215,7 +215,7 @@
          </Button>
          <Button Grid.Column="6" 
                  Command="{Binding CPlaneElevation_Command}" 
-                 ToolTip="{Binding CPlaneElevationToolTip}" 
+                 ToolTip="{Binding CPlaneElevation_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
@@ -223,7 +223,7 @@
          </Button>
          <Button Grid.Column="7" 
                  Command="{Binding CPlaneOrigin_Command}" 
-                 ToolTip="{Binding CPlaneOriginToolTip}" 
+                 ToolTip="{Binding CPlaneOrigin_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneORIGIN.png"
@@ -231,7 +231,7 @@
          </Button>
          <Button Grid.Column="8"
                  Command="{Binding CPlaneObj_Command}"
-                 ToolTip="{Binding CPlaneObjToolTip}" 
+                 ToolTip="{Binding CPlaneObj_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
diff --git a/Icarus/RibPanel/RibPanelVM.vb b/Icarus/RibPanel/RibPanelVM.vb
index 22a65c4..5f85e49 100644
--- a/Icarus/RibPanel/RibPanelVM.vb
+++ b/Icarus/RibPanel/RibPanelVM.vb
@@ -413,6 +413,111 @@ Public Class RibPanelVM
       End Get
    End Property
 
+#Region "Tooltip"
+
+   Public ReadOnly Property Import_ToolTip As String
+      Get
+         Return "Import"
+      End Get
+   End Property
+
+   Public ReadOnly Property Point_ToolTip As String
+      Get
+         Return "Point"
+      End Get
+   End Property
+
+   Public ReadOnly Property Line2P_ToolTip As String
+      Get
+         Return "Multiline"
+      End Get
+   End Property
+
+   Public ReadOnly Property Delete_ToolTip As String
+      Get
+         Return "Delete"
+      End Get
+   End Property
+
+   Public ReadOnly Property ModifyCurve_ToolTip As String
+      Get
+         Return "Modify Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property AddPointCurve_ToolTip As String
+      Get
+         Return "Add Point to Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property RemovePointCurve_ToolTip As String
+      Get
+         Return "Remove Point From Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property Extrude_ToolTip As String
+      Get
+         Return "Modify Extrusion"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneTop_ToolTip As String
+      Get
+         Return "Grid From Top"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneFront_ToolTip As String
+      Get
+         Return "Grid From Front"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneRight_ToolTip As String
+      Get
+         Return "Grid From Right"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneBack_ToolTip As String
+      Get
+         Return "Grid From Back"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneLeft_ToolTip As String
+      Get
+         Return "Grid From Left"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneBottom_ToolTip As String
+      Get
+         Return "Grid From Bottom"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneElevation_ToolTip As String
+      Get
+         Return "Grid Elevation"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneOrigin_ToolTip As String
+      Get
+         Return "Grid Origin"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneObj_ToolTip As String
+      Get
+         Return "Grid On Object"
+      End Get
+   End Property
+
+#End Region    ' Tooltip
 
    ' Definizione comandi
    Private m_cmdImport As ICommand
@@ -794,6 +899,8 @@ Public Class RibPanelVM
             SelRib = m_RibList(m_RibList.Count - 1)
          Else
             SelRib = Nothing
+            m_bEdit_IsChecked = False
+            NotifyPropertyChanged(NameOf( bEdit_IsChecked))
          End If
          NotifyPropertyChanged(NameOf(SelRib))
       End If
diff --git a/Icarus/SceneHost/MySceneHostVM.vb b/Icarus/SceneHost/MySceneHostVM.vb
index 9b75b8d..c6e2860 100644
--- a/Icarus/SceneHost/MySceneHostVM.vb
+++ b/Icarus/SceneHost/MySceneHostVM.vb
@@ -318,8 +318,18 @@ Public Class MySceneHostVM
       WriteMainPrivateProfileString(S_PRINTING3D, K_IMPORTCURREXTENSION, OpenFileDialog.FilterIndex)
       Dim sFile As String = String.Empty
       sFile = OpenFileDialog.FileName
+      ' disabilito ProjManager, TopPanel, TFS, Slider, bottoni e uscita dal programma
+      Map.refProjManagerVM.SetProjCmdIsEnabled(False)
+      Map.refTopPanelVM.SetTopPanelIsEnabled(False)
+      Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(False)
+      Map.refSliceManagerVM.SetButtonsIsEnabled(False)
+      Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
+      Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
+      Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
+      Map.refSliderManagerVM.SetSliderVisibility(False)
       ' importo la nuova geometria
       If MainController.InsertProject(sFile, False) Then
+         Map.refViewLayerManagerVM.SetViewLayerManagerIsEnabled(True)
          ' la sposto in centro tavola
          Dim nNewPartId As Integer = EgtGetLastPart()
          Dim b3NewPart As New BBox3d
@@ -327,6 +337,14 @@ Public Class MySceneHostVM
          EgtMove(nNewPartId, New Point3d((CurrentMachine.b3Tab.DimX / 2) - (b3NewPart.DimX / 2), (CurrentMachine.b3Tab.DimY / 2) - (b3NewPart.DimY / 2), 0) - b3NewPart.Min(), GDB_RT.GLOB)
          ' imposto modalita' import
          Map.refTopPanelVM.SelPage = Pages.IMPORT
+      Else
+         Map.refProjManagerVM.SetProjCmdIsEnabled(True)
+         Map.refTopPanelVM.SetTopPanelIsEnabled(True)
+         Map.refSliceManagerVM.SetButtonsIsEnabled(True)
+         Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
+         Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
+         Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
+         Map.refSliderManagerVM.SetSliderVisibility(True)
       End If
       EgtDraw()
    End Sub
@@ -1064,9 +1082,14 @@ Public Class MySceneHostVM
          Dim nOthersLayerId As Integer = EgtGetFirstNameInGroup(nPartId, LAY_OTHERS)
          Dim sFilePath As String = ""
          EgtGetInfo(nPartId, FILE_PATH, sFilePath)
+         Dim nPartReferenceLayerId As Integer = EgtGetFirstNameInGroup(nPartId, LAY_PARTREFERENCE)
+         If nPartReferenceLayerId = GDB_ID.NULL Then
+            nPartReferenceLayerId = EgtCreateGroup(nPartId)
+            EgtSetName(nPartReferenceLayerId, LAY_PARTREFERENCE)
+         End If
          Dim nReferenceLayerId As Integer = EgtGetFirstNameInGroup(nPartId, LAY_REFERENCE)
          Dim nFrameId As Integer = EgtGetFirstInGroup(nReferenceLayerId)
-         Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
+         Dim NewPart As New Print3dPartVM(nPartId, nPrintPartLayerId, nPartReferenceLayerId, nReferenceLayerId, nFrameId, nMachStartLayerId, nRibsLayerId, nShellNumberLayerId, nAuxSolidsLayerId, nOthersLayerId, sFilePath)
          Map.refTopPanelVM.PartList.Add(NewPart)
          Dim bPartToRecalc As Boolean = False
          EgtGetInfo(nPartId, MAC_TORECALC_SLICE, bPartToRecalc)
diff --git a/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml b/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
index b115690..ab74439 100644
--- a/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
+++ b/Icarus/ShellNumberPanel/ShellNumberPanelV.xaml
@@ -167,7 +167,7 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Command="{Binding CPlaneTop_Command}" 
-                 ToolTip="{Binding CPlaneTopToolTip}"
+                 ToolTip="{Binding CPlaneTop_ToolTip}"
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneTOP.png"
@@ -175,7 +175,7 @@
          </Button>
          <Button Grid.Column="1"
                  Command="{Binding CPlaneFront_Command}" 
-                 ToolTip="{Binding CPlaneFrontToolTip}" 
+                 ToolTip="{Binding CPlaneFront_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
@@ -183,7 +183,7 @@
          </Button>
          <Button Grid.Column="2" 
                  Command="{Binding CPlaneRight_Command}" 
-                 ToolTip="{Binding CPlaneRightToolTip}" 
+                 ToolTip="{Binding CPlaneRight_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
@@ -191,7 +191,7 @@
          </Button>
          <Button Grid.Column="3"
                  Command="{Binding CPlaneBack_Command}" 
-                 ToolTip="{Binding CPlaneBackToolTip}" 
+                 ToolTip="{Binding CPlaneBack_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneBACK.png"
@@ -199,7 +199,7 @@
          </Button>
          <Button Grid.Column="4"
                  Command="{Binding CPlaneLeft_Command}"
-                 ToolTip="{Binding CPlaneLeftToolTip}" 
+                 ToolTip="{Binding CPlaneLeft_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
@@ -207,7 +207,7 @@
          </Button>
          <Button Grid.Column="5"
                  Command="{Binding CPlaneBottom_Command}"
-                 ToolTip="{Binding CPlaneBottomToolTip}"
+                 ToolTip="{Binding CPlaneBottom_ToolTip}"
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
@@ -215,7 +215,7 @@
          </Button>
          <Button Grid.Column="6" 
                  Command="{Binding CPlaneElevation_Command}" 
-                 ToolTip="{Binding CPlaneElevationToolTip}" 
+                 ToolTip="{Binding CPlaneElevation_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
@@ -223,7 +223,7 @@
          </Button>
          <Button Grid.Column="7"
                  Command="{Binding CPlaneOrigin_Command}"
-                 ToolTip="{Binding CPlaneOriginToolTip}" 
+                 ToolTip="{Binding CPlaneOrigin_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CPlaneORIGIN.png"
@@ -231,7 +231,7 @@
          </Button>
          <Button Grid.Column="8"
                  Command="{Binding CPlaneObj_Command}"
-                 ToolTip="{Binding CPlaneObjToolTip}" 
+                 ToolTip="{Binding CPlaneObj_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
diff --git a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
index 97ba11d..6f923f2 100644
--- a/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
+++ b/Icarus/ShellNumberPanel/ShellNumberPanelVM.vb
@@ -393,6 +393,111 @@ Public Class ShellNumberPanelVM
       End Get
    End Property
 
+#Region "Tooltip"
+
+   Public ReadOnly Property Import_ToolTip As String
+      Get
+         Return "Import"
+      End Get
+   End Property
+
+   Public ReadOnly Property Point_ToolTip As String
+      Get
+         Return "Point"
+      End Get
+   End Property
+
+   Public ReadOnly Property Line2P_ToolTip As String
+      Get
+         Return "Multiline"
+      End Get
+   End Property
+
+   Public ReadOnly Property Delete_ToolTip As String
+      Get
+         Return "Delete"
+      End Get
+   End Property
+
+   Public ReadOnly Property ModifyCurve_ToolTip As String
+      Get
+         Return "Modify Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property AddPointCurve_ToolTip As String
+      Get
+         Return "Add Point to Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property RemovePointCurve_ToolTip As String
+      Get
+         Return "Remove Point From Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property Extrude_ToolTip As String
+      Get
+         Return "Modify Extrusion"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneTop_ToolTip As String
+      Get
+         Return "Grid From Top"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneFront_ToolTip As String
+      Get
+         Return "Grid From Front"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneRight_ToolTip As String
+      Get
+         Return "Grid From Right"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneBack_ToolTip As String
+      Get
+         Return "Grid From Back"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneLeft_ToolTip As String
+      Get
+         Return "Grid From Left"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneBottom_ToolTip As String
+      Get
+         Return "Grid From Bottom"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneElevation_ToolTip As String
+      Get
+         Return "Grid Elevation"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneOrigin_ToolTip As String
+      Get
+         Return "Grid Origin"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneObj_ToolTip As String
+      Get
+         Return "Grid On Object"
+      End Get
+   End Property
+
+#End Region    ' Tooltip
 
    ' Definizione comandi
    Private m_cmdImport As ICommand
@@ -777,6 +882,8 @@ Public Class ShellNumberPanelVM
             SelShellNumber = m_ShellNumberList(m_ShellNumberList.Count - 1)
          Else
             SelShellNumber = Nothing
+            m_bEdit_IsChecked = False
+            NotifyPropertyChanged(NameOf( bEdit_IsChecked))
          End If
          NotifyPropertyChanged(NameOf(SelShellNumber))
       End If
diff --git a/Icarus/SliceManager/SliceManagerV.xaml b/Icarus/SliceManager/SliceManagerV.xaml
index 5985fd4..03e2bc0 100644
--- a/Icarus/SliceManager/SliceManagerV.xaml
+++ b/Icarus/SliceManager/SliceManagerV.xaml
@@ -14,7 +14,6 @@
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
          <RowDefinition Height="Auto"/>
-         <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
       <TextBlock Text="{Binding ghTime}"
                  Visibility="{Binding Time_Visibility}"
@@ -37,16 +36,32 @@
                  FontSize="12"
                  Margin="0,0,0,5"
                  Style="{StaticResource SliceManager_TextBlock}"/>
-      <ProgressBar Grid.Row="4" 
-                   Value="{Binding PartialLoading_Value}" 
-                   Visibility="{Binding Loading_Visibility}"
-                   Margin="5,2.5,5,2.5"
-                   Style="{StaticResource Icarus_ProgressBar}"/>
-      <ProgressBar Grid.Row="5" 
-                   Value="{Binding MainLoading_Value}" 
-                   Visibility="{Binding Loading_Visibility}"
-                   Margin="5,2.5,5,5"
-                   Style="{StaticResource Icarus_ProgressBar}"/>
+      <Grid Grid.Row="4"
+            Visibility="{Binding Loading_Visibility}">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+         <ProgressBar Value="{Binding PartialLoading_Value}" 
+                      Margin="5,2.5,2.5,2.5"
+                      Style="{StaticResource Icarus_ProgressBar}"/>
+         <ProgressBar Grid.Row="1" 
+                      Value="{Binding MainLoading_Value}" 
+                      Margin="5,2.5,2.5,5"
+                      Style="{StaticResource Icarus_ProgressBar}"/>
+         <Button Grid.Column="1"
+                 Grid.RowSpan="2"
+                 Command="{Binding StopCalculation_Command}"
+                 Margin="2.5,2.5,5,2.5"
+                 Style="{StaticResource TopPanel_Button}">
+            <Image Source="\Resources\SliceManager\StopCalculation.png"
+                   Style="{StaticResource Button_Image}"/>
+         </Button>
+      </Grid>
       <Grid Grid.Row="6">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>
diff --git a/Icarus/SliceManager/SliceManagerVM.vb b/Icarus/SliceManager/SliceManagerVM.vb
index 1fe7722..01db0c6 100644
--- a/Icarus/SliceManager/SliceManagerVM.vb
+++ b/Icarus/SliceManager/SliceManagerVM.vb
@@ -32,6 +32,9 @@ Public Class SliceManagerVM
    ' Funzioni di callback per output in interfaccia da LUA
    Private m_ProcEventsCallback As New ProcessEventsCallback(AddressOf ProcessEvents)
 
+   Private m_bStopScript As Boolean = False
+   Private m_bStopScriptToManage As Boolean = False
+
    Private m_bSlice As Boolean = False
    Private m_bCalcTFS As Boolean = False
    Private m_bGenerate As Boolean = False
@@ -132,6 +135,7 @@ Public Class SliceManagerVM
             Dim b3Print As BBox3d = Map.refDispositionPanelVM.GetSolidForReferenceBBox(Map.refTopPanelVM.SelPart)
             Return "[ " & DoubleToString(b3Print.DimX, 1) & " x " & DoubleToString(b3Print.DimY, 1) & " x " & DoubleToString(b3Print.DimZ, 1) & " ]"
          End If
+         Return ""
       End Get
    End Property
    Friend Sub UpdateDimensions()
@@ -177,6 +181,7 @@ Public Class SliceManagerVM
 
    ' Definizione comandi
    Private m_cmdSlice As ICommand
+   Private m_cmdStopCalculation As ICommand
    Private m_cmdSimulate As ICommand
    Private m_cmdUpdate As ICommand
    Private m_cmdGenerate As ICommand
@@ -289,13 +294,14 @@ Public Class SliceManagerVM
       UpdateUI()
       ' Eventuale attesa
       Threading.Thread.Sleep(nPause)
-      '' Ritorno eventuale stop
-      'If m_bStopScript Then
-      '   m_bStopScript = False
-      '   Return 1
-      'Else
-      '   Return 0
-      'End If
+      ' Ritorno eventuale stop
+      If m_bStopScript Then
+         m_bStopScript = False
+         m_bStopScriptToManage = True
+         Return 1
+      Else
+         Return 0
+      End If
       Return 0
    End Function
 
@@ -369,8 +375,8 @@ Public Class SliceManagerVM
          Dim nCurrPartId As Integer = EgtGetFirstPart()
          While nCurrPartId <> GDB_ID.NULL
             ' eseguo rimozione flag
-            If m_bSlice Then EgtRemoveInfo(nCurrPartId, MAC_TORECALC_SLICE)
-            If m_bCalcTFS Then EgtRemoveInfo(nCurrPartId, MAC_TORECALC_TFS)
+            If m_bSlice AndAlso Not m_bStopScriptToManage Then EgtRemoveInfo(nCurrPartId, MAC_TORECALC_SLICE)
+            If m_bCalcTFS AndAlso Not m_bStopScriptToManage Then EgtRemoveInfo(nCurrPartId, MAC_TORECALC_TFS)
             nCurrPartId = EgtGetNextPart(nCurrPartId)
          End While
          ' aggiorno massa
@@ -537,19 +543,52 @@ Public Class SliceManagerVM
          m_bCalculating = False
          Return
       End If
-      ' esco da altre pagine
-      Map.refTopPanelVM.SelPage = Pages.NULL
+      '' esco da altre pagine
+      'Dim PreviousPage As Pages = Map.refTopPanelVM.SelPage
       ' eseguo calcoli
       CalcSlice(False)
-      Map.refTopPanelVM.SelPage = Pages.SLICE
-      Map.refSliderManagerVM.SetLayerIndexToMax()
-      NotifyPropertyChanged(NameOf(Time_Visibility))
-      NotifyPropertyChanged(NameOf(Mass_Visibility))
+      ' se non ho interrotto calcoli
+      If Not m_bStopScriptToManage Then
+         Map.refTopPanelVM.SelPage = Pages.NULL
+         Map.refTopPanelVM.SelPage = Pages.SLICE
+         Map.refSliderManagerVM.SetLayerIndexToMax()
+         NotifyPropertyChanged(NameOf(Time_Visibility))
+         NotifyPropertyChanged(NameOf(Mass_Visibility))
+         'Else
+         '   Map.refTopPanelVM.SelPage = PreviousPage
+      Else
+         m_bStopScriptToManage = False
+      End If
       m_bCalculating = False
    End Sub
 
 #End Region ' Slice
 
+#Region "StopCalculation"
+
+   ''' <summary>
+   ''' Returns a command that do CPlaneTop.
+   ''' </summary>
+   Public ReadOnly Property StopCalculation_Command As ICommand
+      Get
+         If m_cmdStopCalculation Is Nothing Then
+            m_cmdStopCalculation = New Command(AddressOf StopCalculation)
+         End If
+         Return m_cmdStopCalculation
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the CPlaneTop.  This method is invoked by the CPlaneTopCommand.
+   ''' </summary>
+   Public Sub StopCalculation()
+      If Not m_bCalculating Then Return
+      m_bStopScript = True
+      m_bCalculating = False
+   End Sub
+
+#End Region ' StopCalculation
+
 #Region "Update"
 
    ''' <summary>
@@ -572,8 +611,13 @@ Public Class SliceManagerVM
       m_bCalculating = True
       ' eseguo calcoli
       CalcSlice(False)
-      NotifyPropertyChanged(NameOf(Time_Visibility))
-      NotifyPropertyChanged(NameOf(Mass_Visibility))
+      ' se non ho interrotto calcoli
+      If Not m_bStopScriptToManage Then
+         NotifyPropertyChanged(NameOf(Time_Visibility))
+         NotifyPropertyChanged(NameOf(Mass_Visibility))
+      Else
+         m_bStopScriptToManage = False
+      End If
       m_bCalculating = False
    End Sub
 
@@ -646,17 +690,22 @@ Public Class SliceManagerVM
       End If
       ' eseguo calcoli
       CalcSlice(True, True)
-      If bShiftPressed Then
-         ' Se esiste ne lancio l'editing
-         If File.Exists(sIsoFilePath) Then
-            Process.Start("Notepad.exe", sIsoFilePath)
-            ' altrimenti lo segnalo
-         Else
-            MessageBox.Show("Edit failed, missing part program file" & " (" & sIsoFilePath & ")")
+      ' se non ho interrotto calcoli
+      If Not m_bStopScriptToManage Then
+         If bShiftPressed Then
+            ' Se esiste ne lancio l'editing
+            If File.Exists(sIsoFilePath) Then
+               Process.Start("Notepad.exe", sIsoFilePath)
+               ' altrimenti lo segnalo
+            Else
+               MessageBox.Show("Edit failed, missing part program file" & " (" & sIsoFilePath & ")")
+            End If
          End If
+         NotifyPropertyChanged(NameOf(Time_Visibility))
+         NotifyPropertyChanged(NameOf(Mass_Visibility))
+      Else
+         m_bStopScriptToManage = False
       End If
-      NotifyPropertyChanged(NameOf(Time_Visibility))
-      NotifyPropertyChanged(NameOf(Mass_Visibility))
       m_bCalculating = False
    End Sub
 
@@ -684,10 +733,15 @@ Public Class SliceManagerVM
       ' eseguo calcoli
       CalcSlice(True)
       m_bCalculating = False
-      ' verifico esistenza e correttezza machgroup
-      InitMachGroup(False)
-      ' apro simulazione
-      Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.SIMULATION)
+      ' se non ho interrotto calcoli
+      If Not m_bStopScriptToManage Then
+         ' verifico esistenza e correttezza machgroup
+         InitMachGroup(False)
+         ' apro simulazione
+         Map.refRightPanelVM.SetSelPanel(RightPanelVM.Panels.SIMULATION)
+      Else
+         m_bStopScriptToManage = False
+      End If
    End Sub
 
 #End Region ' Simulate
diff --git a/Icarus/StartMachPanel/StartMachPanelV.xaml b/Icarus/StartMachPanel/StartMachPanelV.xaml
index afdb55c..eec58a9 100644
--- a/Icarus/StartMachPanel/StartMachPanelV.xaml
+++ b/Icarus/StartMachPanel/StartMachPanelV.xaml
@@ -153,7 +153,7 @@
             <ColumnDefinition Width="Auto"/>
          </Grid.ColumnDefinitions>
          <Button Command="{Binding CPlaneTop_Command}" 
-                 ToolTip="{Binding CPlaneTopToolTip}"
+                 ToolTip="{Binding CPlaneTop_ToolTip}"
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneTOP.png"
@@ -161,7 +161,7 @@
          </Button>
          <Button Grid.Column="1"
                  Command="{Binding CPlaneFront_Command}" 
-                 ToolTip="{Binding CPlaneFrontToolTip}" 
+                 ToolTip="{Binding CPlaneFront_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneFRONT.png"
@@ -169,7 +169,7 @@
          </Button>
          <Button Grid.Column="2" 
                  Command="{Binding CPlaneRight_Command}" 
-                 ToolTip="{Binding CPlaneRightToolTip}" 
+                 ToolTip="{Binding CPlaneRight_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneRIGHT.png"
@@ -177,7 +177,7 @@
          </Button>
          <Button Grid.Column="3"
                  Command="{Binding CPlaneBack_Command}" 
-                 ToolTip="{Binding CPlaneBackToolTip}" 
+                 ToolTip="{Binding CPlaneBack_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneBACK.png"
@@ -185,7 +185,7 @@
          </Button>
          <Button Grid.Column="4"
                  Command="{Binding CPlaneLeft_Command}"
-                 ToolTip="{Binding CPlaneLeftToolTip}" 
+                 ToolTip="{Binding CPlaneLeft_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneLEFT.png"
@@ -193,7 +193,7 @@
          </Button>
          <Button Grid.Column="5"
                  Command="{Binding CPlaneBottom_Command}"
-                 ToolTip="{Binding CPlaneBottomToolTip}"
+                 ToolTip="{Binding CPlaneBottom_ToolTip}"
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneBOTTOM.png"
@@ -201,7 +201,7 @@
          </Button>
          <Button Grid.Column="6" 
                  Command="{Binding CPlaneElevation_Command}" 
-                 ToolTip="{Binding CPlaneElevationToolTip}" 
+                 ToolTip="{Binding CPlaneElevation_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneELEVATION.png"
@@ -209,7 +209,7 @@
          </Button>
          <Button Grid.Column="7"
                  Command="{Binding CPlaneOrigin_Command}"
-                 ToolTip="{Binding CPlaneOriginToolTip}" 
+                 ToolTip="{Binding CPlaneOrigin_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneORIGIN.png"
@@ -217,7 +217,7 @@
          </Button>
          <Button Grid.Column="8"
                  Command="{Binding CPlaneObj_Command}"
-                 ToolTip="{Binding CPlaneObjToolTip}" 
+                 ToolTip="{Binding CPlaneObj_ToolTip}" 
                  Margin="2.5,0,2.5,0"
                  Style="{StaticResource ToolBar_Button}">
             <Image Source="/Resources/GridViewPanel/CplaneOBJECT.png"
diff --git a/Icarus/StartMachPanel/StartMachPanelVM.vb b/Icarus/StartMachPanel/StartMachPanelVM.vb
index eacae1a..32176d6 100644
--- a/Icarus/StartMachPanel/StartMachPanelVM.vb
+++ b/Icarus/StartMachPanel/StartMachPanelVM.vb
@@ -304,6 +304,100 @@ Public Class StartMachPanelVM
       End Get
    End Property
 
+#Region "Tooltip"
+
+   Public ReadOnly Property Point_ToolTip As String
+      Get
+         Return "Point"
+      End Get
+   End Property
+
+   Public ReadOnly Property Line2P_ToolTip As String
+      Get
+         Return "Multiline"
+      End Get
+   End Property
+
+   Public ReadOnly Property Delete_ToolTip As String
+      Get
+         Return "Delete"
+      End Get
+   End Property
+
+   Public ReadOnly Property ModifyCurve_ToolTip As String
+      Get
+         Return "Modify Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property AddPointCurve_ToolTip As String
+      Get
+         Return "Add Point to Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property RemovePointCurve_ToolTip As String
+      Get
+         Return "Remove Point From Curve"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneTop_ToolTip As String
+      Get
+         Return "Grid From Top"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneFront_ToolTip As String
+      Get
+         Return "Grid From Front"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneRight_ToolTip As String
+      Get
+         Return "Grid From Right"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneBack_ToolTip As String
+      Get
+         Return "Grid From Back"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneLeft_ToolTip As String
+      Get
+         Return "Grid From Left"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneBottom_ToolTip As String
+      Get
+         Return "Grid From Bottom"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneElevation_ToolTip As String
+      Get
+         Return "Grid Elevation"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneOrigin_ToolTip As String
+      Get
+         Return "Grid Origin"
+      End Get
+   End Property
+
+   Public ReadOnly Property CPlaneObj_ToolTip As String
+      Get
+         Return "Grid On Object"
+      End Get
+   End Property
+
+#End Region    ' Tooltip
+
    ' Definizione comandi
    Private m_cmdPoint As ICommand
    Private m_cmdLine2P As ICommand
@@ -912,6 +1006,8 @@ Public Class StartMachPanelVM
             SelStart = m_StartList(m_StartList.Count - 1)
          Else
             SelStart = Nothing
+            m_bEdit_IsChecked = False
+            NotifyPropertyChanged(NameOf( bEdit_IsChecked))
          End If
          NotifyPropertyChanged(NameOf(SelStart))
       End If
diff --git a/Icarus/TopPanel/TopPanelVM.vb b/Icarus/TopPanel/TopPanelVM.vb
index b2f0fde..20b7d48 100644
--- a/Icarus/TopPanel/TopPanelVM.vb
+++ b/Icarus/TopPanel/TopPanelVM.vb
@@ -414,6 +414,7 @@ Public Class TopPanelVM
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(False)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(False)
       Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(False)
+      Map.refSliderManagerVM.SetSliderVisibility(False)
       ' imposto pagina
       Map.refLeftPanelVM.SetSelPanel(LeftPanelVM.Panels.IMPORT)
       ''Map.refImportPanelVM.Init()
@@ -428,6 +429,7 @@ Public Class TopPanelVM
       Map.refSliderManagerVM.SetLayerIndexIsEnabled(True)
       Map.refSliderManagerVM.SetLayerAdvancementIsEnabled(True)
       Map.refInstrumentPanelVM.SetEdgeAnalysisIsEnabled(True)
+      Map.refSliderManagerVM.SetSliderVisibility(True)
       Return True
    End Function
 
diff --git a/Icarus/ViewLayerManager/ViewLayerManagerVM.vb b/Icarus/ViewLayerManager/ViewLayerManagerVM.vb
index 12ae2a6..6793b7d 100644
--- a/Icarus/ViewLayerManager/ViewLayerManagerVM.vb
+++ b/Icarus/ViewLayerManager/ViewLayerManagerVM.vb
@@ -328,7 +328,7 @@ Public Class ViewLayer
    Friend Sub WriteIsVisibleToIni()
       Dim nStatus As Integer = If(m_IsVisible, 1, 0)
       Select Case Map.refTopPanelVM.SelPage
-         Case Pages.MODIFY
+         Case Pages.IMPORT, Pages.MODIFY, Pages.MATERIALDB, Pages.MACHININGDB, Pages.CURRMACHINING, Pages.MODIFYPART
             Select Case m_Type
                Case ViewLayerType.PRINT_SOLID
                   WriteMainPrivateProfileString(S_VIEWLAYER, K_MOD_PRINTSOLID, nStatus)
diff --git a/Icarus/ViewModel/Print3dPartVM.vb b/Icarus/ViewModel/Print3dPartVM.vb
index 0c27358..b6de868 100644
--- a/Icarus/ViewModel/Print3dPartVM.vb
+++ b/Icarus/ViewModel/Print3dPartVM.vb
@@ -25,7 +25,25 @@ Public Class Print3dPartVM
       End Get
    End Property
 
-   ' riferimento del solido/superficie di stampa
+   ' riferimento del pezzo solido/superficie da stampare 
+   Private m_nPartReferenceLayerId As Integer = GDB_ID.NULL
+   Public ReadOnly Property nPartReferenceLayerId As Integer
+      Get
+         Return m_nPartReferenceLayerId
+      End Get
+   End Property
+   Private m_nPartReferenceId As Integer = GDB_ID.NULL
+   Public ReadOnly Property nPartReferenceId As Integer
+      Get
+         Dim nTemp As Integer = EgtGetFirstInGroup(nPartReferenceLayerId)
+         If nTemp <> GDB_ID.NULL Then
+            Return nTemp
+         Else
+            Return m_nReferenceId
+         End If
+      End Get
+   End Property
+   ' riferimento di stampa del pezzo solido/superficie (sempre Z 0)
    Private m_nReferenceLayerId As Integer = GDB_ID.NULL
    Public ReadOnly Property nReferenceLayerId As Integer
       Get
@@ -122,10 +140,11 @@ Public Class Print3dPartVM
       m_sImportedFilePath = sImportedFilePath
    End Sub
 
-   Sub New(nPartId As Integer, nPrintSolidLayerId As Integer, nReferenceLayerId As Integer, nReferenceId As Integer, nMachStartLayerId As Integer,
+   Sub New(nPartId As Integer, nPrintSolidLayerId As Integer, nPartReferenceLayerId As Integer, nReferenceLayerId As Integer, nReferenceId As Integer, nMachStartLayerId As Integer,
            nRibsLayerId As Integer, nShellNumberLayerId As Integer, nAuxSolidsLayerId As Integer, nOthersLayerId As Integer, sImportedFilePath As String)
       m_nPartId = nPartId
       m_nPrintSolidLayerId = nPrintSolidLayerId
+      m_nPartReferenceLayerId = nPartReferenceLayerId
       m_nReferenceLayerId = nReferenceLayerId
       m_nReferenceId = nReferenceId
       m_nMachStartLayerId = nMachStartLayerId
diff --git a/Icarus/ViewPanel/ViewPanelV.xaml b/Icarus/ViewPanel/ViewPanelV.xaml
index cff3a79..2145760 100644
--- a/Icarus/ViewPanel/ViewPanelV.xaml
+++ b/Icarus/ViewPanel/ViewPanelV.xaml
@@ -59,8 +59,8 @@
       <Image Source="/Resources/ViewPanel/LookFromISO_SE.png"
              Style="{StaticResource Button_Image}"/>
    </Button>
-   <Button ToolTip="{Binding ViewToCPlaneToolTip}" 
-           Command="{Binding ViewToCPlaneCommand}"
+   <Button ToolTip="{Binding ViewFromCPlaneToolTip}" 
+           Command="{Binding ViewFromCPlaneCommand}"
            Margin="2.5,0,2.5,0"
            Style="{StaticResource BottomPanel_Button}">
       <Image Source="/Resources/ViewPanel/CplaneView.png"
diff --git a/Icarus/ViewPanel/ViewPanelVM.vb b/Icarus/ViewPanel/ViewPanelVM.vb
index c7264bb..f8d7cfe 100644
--- a/Icarus/ViewPanel/ViewPanelVM.vb
+++ b/Icarus/ViewPanel/ViewPanelVM.vb
@@ -15,7 +15,7 @@ Public Class ViewPanelVM
    Private m_cmdRightView As ICommand
    Private m_cmdIsoViewSW As ICommand
    Private m_cmdIsoViewSE As ICommand
-   Private m_cmdViewToCPlane As ICommand
+   Private m_cmdViewFromCPlane As ICommand
 
 #Region "ToolTip"
 
@@ -55,12 +55,24 @@ Public Class ViewPanelVM
       End Get
    End Property
 
-   Public ReadOnly Property LookFromIso_SWToolTip As String
+   Public ReadOnly Property LookFromIsoSWToolTip As String
       Get
          Return EgtMsg(MSG_GRIDVIEWPANEL + 12)
       End Get
    End Property
 
+   Public ReadOnly Property LookFromIsoSEToolTip As String
+      Get
+         Return "SE Isometric View"
+      End Get
+   End Property
+
+   Public ReadOnly Property ViewFromCPlaneToolTip As String
+      Get
+         Return "View From CPlane"
+      End Get
+   End Property
+
 #End Region    ' ToolTip
 
 #End Region    ' FIELDS & PROPERTIES
@@ -231,7 +243,7 @@ Public Class ViewPanelVM
 #Region "IsoViewSECommand"
 
    ''' <summary>
-   ''' Returns a command that do IsoViewSW.
+   ''' Returns a command that do IsoViewSE.
    ''' </summary>
    Public ReadOnly Property IsoViewSECommand As ICommand
       Get
@@ -243,7 +255,7 @@ Public Class ViewPanelVM
    End Property
 
    ''' <summary>
-   ''' Execute the IsoViewSW.  This method is invoked by the IsoViewSWCommand.
+   ''' Execute the IsoViewSW.  This method is invoked by the IsoViewSECommand.
    ''' </summary>
    Public Sub IsoViewSE(ByVal param As Object)
       Map.refSceneHostVM.MainScene.IsoViewSE()
@@ -251,28 +263,28 @@ Public Class ViewPanelVM
 
 #End Region ' IsoViewSECommand
 
-#Region "ViewToCPlaneCommand"
+#Region "ViewFromCPlaneCommand"
 
    ''' <summary>
-   ''' Returns a command that do GetDist.
+   ''' Returns a command that do ViewFromCPlane.
    ''' </summary>
-   Public ReadOnly Property ViewToCPlaneCommand As ICommand
+   Public ReadOnly Property ViewFromCPlaneCommand As ICommand
       Get
-         If m_cmdViewToCPlane Is Nothing Then
-            m_cmdViewToCPlane = New Command(AddressOf ViewToCPlane)
+         If m_cmdViewFromCPlane Is Nothing Then
+            m_cmdViewFromCPlane = New Command(AddressOf ViewFromCPlane)
          End If
-         Return m_cmdViewToCPlane
+         Return m_cmdViewFromCPlane
       End Get
    End Property
 
    ''' <summary>
-   ''' Execute the GetDist.  This method is invoked by the GetDistCommand.
+   ''' Execute the ViewFromCPlane.  This method is invoked by the ViewFromCPlaneCommand.
    ''' </summary>
-   Public Sub ViewToCPlane(ByVal param As Object)
+   Public Sub ViewFromCPlane(ByVal param As Object)
       Map.refSceneHostVM.MainScene.CPlaneView()
    End Sub
 
-#End Region ' ViewToCPlaneCommand
+#End Region ' ViewFromCPlaneCommand
 
 #End Region    ' COMMANDS