diff --git a/pcbnew/dialogs/dialog_graphic_item_properties.cpp b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
index d656d5b06c..3f1d82411e 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties.cpp
@@ -55,6 +55,8 @@ private:
     UNIT_BINDER           m_bezierCtrl1X, m_bezierCtrl1Y;
     UNIT_BINDER           m_bezierCtrl2X, m_bezierCtrl2Y;
 
+    bool                  m_flipStartEnd;
+
     wxFloatingPointValidator<double>    m_AngleValidator;
     double                m_AngleValue;
 
@@ -91,6 +93,7 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES::DIALOG_GRAPHIC_ITEM_PROPERTIES( PCB_BASE_EDIT_FR
     m_bezierCtrl1Y( aParent, m_BezierPointC1YLabel, m_BezierC1Y_Ctrl, m_BezierPointC1YUnit ),
     m_bezierCtrl2X( aParent, m_BezierPointC2XLabel, m_BezierC2X_Ctrl, m_BezierPointC2XUnit ),
     m_bezierCtrl2Y( aParent, m_BezierPointC2YLabel, m_BezierC2Y_Ctrl, m_BezierPointC2YUnit ),
+    m_flipStartEnd( false ),
     m_AngleValidator( 1, &m_AngleValue ),
     m_AngleValue( 0.0 )
 {
@@ -146,8 +149,10 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataToWindow()
     // Only a Bezeier curve has control points. So do not show these parameters for other shapes
     if( m_item->GetShape() != S_CURVE )
     {
+        m_bezierCtrlPt1Label->Show( false );
         m_bezierCtrl1X.Show( false );
         m_bezierCtrl1Y.Show( false );
+        m_bezierCtrlPt2Label->Show( false );
         m_bezierCtrl2X.Show( false );
         m_bezierCtrl2Y.Show( false );
     }
@@ -157,28 +162,30 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataToWindow()
     {
     case S_CIRCLE:
         SetTitle( _( "Circle Properties" ) );
-        m_startXLabel->SetLabel( _( "Center X:" ) );
-        m_startYLabel->SetLabel( _( "Center Y:" ) );
-        m_endXLabel->SetLabel( _( "Radius:" ) );
+        m_startPointLabel->SetLabel( _( "Center" ) );
+        m_endPointLabel->SetLabel( _( "Radius" ) );
         m_endY.Show( false );
         break;
 
     case S_ARC:
         SetTitle( _( "Arc Properties" ) );
-        m_startXLabel->SetLabel( _( "Center X:" ) );
-        m_startYLabel->SetLabel( _( "Center Y:" ) );
-        m_endXLabel->SetLabel( _( "Start Point X:" ) );
-        m_endYLabel->SetLabel( _( "Start Point Y:" ) );
+        m_startPointLabel->SetLabel( _( "Center" ) );
+        m_endPointLabel->SetLabel( _( "Start Point" ) );
 
         m_AngleValue = m_item->GetAngle() / 10.0;
         break;
 
     case S_POLYGON:
         SetTitle( _( "Polygon Properties" ) );
-        m_fgUpperLeftGridSizer->Show( false );
+        m_sizerLeft->Show( false );
         break;
 
     case S_SEGMENT:
+        if( m_item->GetStart().x == m_item->GetEnd().x )
+            m_flipStartEnd = m_item->GetStart().y > m_item->GetEnd().y;
+        else
+            m_flipStartEnd = m_item->GetStart().x > m_item->GetEnd().x;
+
         SetTitle( _( "Line Segment Properties" ) );
         break;
 
@@ -186,13 +193,26 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataToWindow()
         break;
     }
 
-    m_startX.SetValue( m_item->GetStart().x );
-    m_startY.SetValue( m_item->GetStart().y );
+    if( m_flipStartEnd )
+    {
+        m_startX.SetValue( m_item->GetEnd().x );
+        m_startY.SetValue( m_item->GetEnd().y );
+    }
+    else
+    {
+        m_startX.SetValue( m_item->GetStart().x );
+        m_startY.SetValue( m_item->GetStart().y );
+    }
 
     if(  m_item->GetShape() == S_CIRCLE )
     {
         m_endX.SetValue( m_item->GetRadius() );
     }
+    else if( m_flipStartEnd )
+    {
+        m_endX.SetValue( m_item->GetStart().x );
+        m_endY.SetValue( m_item->GetStart().y );
+    }
     else
     {
         m_endX.SetValue( m_item->GetEnd().x );
@@ -228,13 +248,26 @@ bool DIALOG_GRAPHIC_ITEM_PROPERTIES::TransferDataFromWindow()
     BOARD_COMMIT commit( m_parent );
     commit.Modify( m_item );
 
-    m_item->SetStartX( m_startX.GetValue() );
-    m_item->SetStartY( m_startY.GetValue() );
+    if( m_flipStartEnd )
+    {
+        m_item->SetEndX( m_startX.GetValue() );
+        m_item->SetEndY( m_startY.GetValue() );
+    }
+    else
+    {
+        m_item->SetStartX( m_startX.GetValue() );
+        m_item->SetStartY( m_startY.GetValue() );
+    }
 
     if( m_item->GetShape() == S_CIRCLE )
     {
         m_item->SetEnd( m_item->GetStart() + wxPoint( m_endX.GetValue(), 0 ) );
     }
+    else if( m_flipStartEnd )
+    {
+        m_item->SetStartX( m_endX.GetValue() );
+        m_item->SetStartY( m_endY.GetValue() );
+    }
     else
     {
         m_item->SetEndX( m_endX.GetValue() );
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp b/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp
index 7ac544226b..e941b0ccb6 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.cpp
@@ -19,134 +19,150 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind
 	bMainSizer = new wxBoxSizer( wxVERTICAL );
 	
 	wxBoxSizer* bUpperSizer;
-	bUpperSizer = new wxBoxSizer( wxHORIZONTAL );
+	bUpperSizer = new wxBoxSizer( wxVERTICAL );
 	
-	m_fgUpperLeftGridSizer = new wxFlexGridSizer( 8, 3, 0, 0 );
-	m_fgUpperLeftGridSizer->AddGrowableCol( 1 );
-	m_fgUpperLeftGridSizer->SetFlexibleDirection( wxBOTH );
-	m_fgUpperLeftGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	m_sizerLeft = new wxGridBagSizer( 5, 5 );
+	m_sizerLeft->SetFlexibleDirection( wxBOTH );
+	m_sizerLeft->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	m_sizerLeft->SetEmptyCellSize( wxSize( 5,5 ) );
 	
-	m_startXLabel = new wxStaticText( this, wxID_ANY, _("Start point X:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_startPointLabel = new wxStaticText( this, wxID_ANY, _("Start Point"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_startPointLabel->Wrap( -1 );
+	m_sizerLeft->Add( m_startPointLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 3 ), wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	m_startXLabel = new wxStaticText( this, wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_startXLabel->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_startXLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
+	m_sizerLeft->Add( m_startXLabel, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 	
 	m_startXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_fgUpperLeftGridSizer->Add( m_startXCtrl, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 );
+	m_sizerLeft->Add( m_startXCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_startXUnits = new wxStaticText( this, wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_startXUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_startXUnits->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_startXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_sizerLeft->Add( m_startXUnits, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 15 );
 	
-	m_startYLabel = new wxStaticText( this, wxID_ANY, _("Start point Y:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_startYLabel = new wxStaticText( this, wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_startYLabel->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_startYLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
+	m_sizerLeft->Add( m_startYLabel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 	
 	m_startYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_fgUpperLeftGridSizer->Add( m_startYCtrl, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 );
+	m_sizerLeft->Add( m_startYCtrl, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_startYUnits = new wxStaticText( this, wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_startYUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_startYUnits->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_startYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_sizerLeft->Add( m_startYUnits, wxGBPosition( 2, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 15 );
 	
-	m_endXLabel = new wxStaticText( this, wxID_ANY, _("End point X:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_endPointLabel = new wxStaticText( this, wxID_ANY, _("End Point"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_endPointLabel->Wrap( -1 );
+	m_sizerLeft->Add( m_endPointLabel, wxGBPosition( 0, 3 ), wxGBSpan( 1, 3 ), wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	m_endXLabel = new wxStaticText( this, wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_endXLabel->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_endXLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
+	m_sizerLeft->Add( m_endXLabel, wxGBPosition( 1, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 	
 	m_endXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_fgUpperLeftGridSizer->Add( m_endXCtrl, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 );
+	m_sizerLeft->Add( m_endXCtrl, wxGBPosition( 1, 4 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_endXUnits = new wxStaticText( this, wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_endXUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_endXUnits->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_endXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_sizerLeft->Add( m_endXUnits, wxGBPosition( 1, 5 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 	
-	m_endYLabel = new wxStaticText( this, wxID_ANY, _("End point Y:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_endYLabel = new wxStaticText( this, wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_endYLabel->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_endYLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
+	m_sizerLeft->Add( m_endYLabel, wxGBPosition( 2, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 	
 	m_endYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_fgUpperLeftGridSizer->Add( m_endYCtrl, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 5 );
+	m_sizerLeft->Add( m_endYCtrl, wxGBPosition( 2, 4 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_endYUnits = new wxStaticText( this, wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_endYUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_endYUnits->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_endYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	m_sizerLeft->Add( m_endYUnits, wxGBPosition( 2, 5 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 	
-	m_BezierPointC1XLabel = new wxStaticText( this, wxID_ANY, _("Bezier point C1 X:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_bezierCtrlPt1Label = new wxStaticText( this, wxID_ANY, _("Bezier Control Pt"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_bezierCtrlPt1Label->Wrap( -1 );
+	m_sizerLeft->Add( m_bezierCtrlPt1Label, wxGBPosition( 4, 0 ), wxGBSpan( 1, 3 ), wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	m_BezierPointC1XLabel = new wxStaticText( this, wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_BezierPointC1XLabel->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_BezierPointC1XLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_sizerLeft->Add( m_BezierPointC1XLabel, wxGBPosition( 5, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 	
 	m_BezierC1X_Ctrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_fgUpperLeftGridSizer->Add( m_BezierC1X_Ctrl, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
+	m_sizerLeft->Add( m_BezierC1X_Ctrl, wxGBPosition( 5, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_BezierPointC1XUnit = new wxStaticText( this, wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_BezierPointC1XUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_BezierPointC1XUnit->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_BezierPointC1XUnit, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_sizerLeft->Add( m_BezierPointC1XUnit, wxGBPosition( 5, 2 ), wxGBSpan( 1, 1 ), wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_BezierPointC1YLabel = new wxStaticText( this, wxID_ANY, _("Bezier point C1 Y:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_BezierPointC1YLabel = new wxStaticText( this, wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_BezierPointC1YLabel->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_BezierPointC1YLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_sizerLeft->Add( m_BezierPointC1YLabel, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 	
 	m_BezierC1Y_Ctrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_fgUpperLeftGridSizer->Add( m_BezierC1Y_Ctrl, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
+	m_sizerLeft->Add( m_BezierC1Y_Ctrl, wxGBPosition( 6, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_BezierPointC1YUnit = new wxStaticText( this, wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_BezierPointC1YUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_BezierPointC1YUnit->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_BezierPointC1YUnit, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_sizerLeft->Add( m_BezierPointC1YUnit, wxGBPosition( 6, 2 ), wxGBSpan( 1, 1 ), wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_BezierPointC2XLabel = new wxStaticText( this, wxID_ANY, _("Bezier point C2 X:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_bezierCtrlPt2Label = new wxStaticText( this, wxID_ANY, _("Bezier Control Pt"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_bezierCtrlPt2Label->Wrap( -1 );
+	m_sizerLeft->Add( m_bezierCtrlPt2Label, wxGBPosition( 4, 3 ), wxGBSpan( 1, 3 ), wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_BezierPointC2XLabel = new wxStaticText( this, wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_BezierPointC2XLabel->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_BezierPointC2XLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_sizerLeft->Add( m_BezierPointC2XLabel, wxGBPosition( 5, 3 ), wxGBSpan( 1, 1 ), wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
 	
 	m_BezierC2X_Ctrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_fgUpperLeftGridSizer->Add( m_BezierC2X_Ctrl, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
+	m_sizerLeft->Add( m_BezierC2X_Ctrl, wxGBPosition( 5, 4 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_BezierPointC2XUnit = new wxStaticText( this, wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_BezierPointC2XUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_BezierPointC2XUnit->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_BezierPointC2XUnit, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_sizerLeft->Add( m_BezierPointC2XUnit, wxGBPosition( 5, 5 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 	
-	m_BezierPointC2YLabel = new wxStaticText( this, wxID_ANY, _("Bezier point C2 Y:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_BezierPointC2YLabel = new wxStaticText( this, wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_BezierPointC2YLabel->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_BezierPointC2YLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	m_sizerLeft->Add( m_BezierPointC2YLabel, wxGBPosition( 6, 3 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 	
 	m_BezierC2Y_Ctrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_fgUpperLeftGridSizer->Add( m_BezierC2Y_Ctrl, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
+	m_sizerLeft->Add( m_BezierC2Y_Ctrl, wxGBPosition( 6, 4 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_BezierPointC2YUnit = new wxStaticText( this, wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_BezierPointC2YUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_BezierPointC2YUnit->Wrap( -1 );
-	m_fgUpperLeftGridSizer->Add( m_BezierPointC2YUnit, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_sizerLeft->Add( m_BezierPointC2YUnit, wxGBPosition( 6, 5 ), wxGBSpan( 1, 1 ), wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 	
 	
-	bUpperSizer->Add( m_fgUpperLeftGridSizer, 1, wxEXPAND|wxRIGHT, 30 );
+	bUpperSizer->Add( m_sizerLeft, 1, wxEXPAND|wxBOTTOM, 20 );
 	
 	wxBoxSizer* bUpperRightSizer;
 	bUpperRightSizer = new wxBoxSizer( wxVERTICAL );
 	
 	wxFlexGridSizer* fgUpperRightGridSizer;
-	fgUpperRightGridSizer = new wxFlexGridSizer( 0, 3, 0, 0 );
+	fgUpperRightGridSizer = new wxFlexGridSizer( 0, 3, 5, 0 );
 	fgUpperRightGridSizer->AddGrowableCol( 1 );
 	fgUpperRightGridSizer->SetFlexibleDirection( wxBOTH );
 	fgUpperRightGridSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
 	m_angleLabel = new wxStaticText( this, wxID_ANY, _("Arc angle:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_angleLabel->Wrap( -1 );
-	fgUpperRightGridSizer->Add( m_angleLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP, 5 );
+	fgUpperRightGridSizer->Add( m_angleLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 );
 	
 	m_angleCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgUpperRightGridSizer->Add( m_angleCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
+	fgUpperRightGridSizer->Add( m_angleCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_angleUnits = new wxStaticText( this, wxID_ANY, _("deg"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_angleUnits->Wrap( -1 );
-	fgUpperRightGridSizer->Add( m_angleUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	fgUpperRightGridSizer->Add( m_angleUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 );
 	
 	m_thicknessLabel = new wxStaticText( this, wxID_ANY, _("Line thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_thicknessLabel->Wrap( -1 );
-	fgUpperRightGridSizer->Add( m_thicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	fgUpperRightGridSizer->Add( m_thicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 );
 	
 	m_thicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgUpperRightGridSizer->Add( m_thicknessCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
+	fgUpperRightGridSizer->Add( m_thicknessCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
 	
-	m_thicknessUnits = new wxStaticText( this, wxID_ANY, _("Unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_thicknessUnits = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_thicknessUnits->Wrap( -1 );
-	fgUpperRightGridSizer->Add( m_thicknessUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	fgUpperRightGridSizer->Add( m_thicknessUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 );
 	
 	m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_LayerLabel->Wrap( -1 );
@@ -165,7 +181,7 @@ DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE::DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE( wxWind
 	bUpperSizer->Add( bUpperRightSizer, 0, wxEXPAND, 5 );
 	
 	
-	bMainSizer->Add( bUpperSizer, 1, wxEXPAND|wxALL, 10 );
+	bMainSizer->Add( bUpperSizer, 1, wxEXPAND|wxALL, 5 );
 	
 	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
 	bMainSizer->Add( m_staticline1, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 );
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp b/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp
index 5bee84fe2a..0318ee5cd2 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp
+++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.fbp
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <wxFormBuilder_Project>
-    <FileVersion major="1" minor="14" />
+    <FileVersion major="1" minor="13" />
     <object class="Project" expanded="1">
-        <property name="class_decoration" />
+        <property name="class_decoration"></property>
         <property name="code_generation">C++</property>
         <property name="disconnect_events">1</property>
         <property name="disconnect_mode">source_name</property>
@@ -16,9 +16,9 @@
         <property name="help_provider">none</property>
         <property name="internationalize">1</property>
         <property name="name">DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE</property>
-        <property name="namespace" />
+        <property name="namespace"></property>
         <property name="path">.</property>
-        <property name="precompiled_header" />
+        <property name="precompiled_header"></property>
         <property name="relative_path">1</property>
         <property name="skip_lua_events">1</property>
         <property name="skip_php_events">1</property>
@@ -29,2149 +29,2564 @@
         <object class="Dialog" expanded="1">
             <property name="aui_managed">0</property>
             <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
-            <property name="bg" />
+            <property name="bg"></property>
             <property name="center">wxBOTH</property>
-            <property name="context_help" />
+            <property name="context_help"></property>
             <property name="context_menu">1</property>
             <property name="enabled">1</property>
             <property name="event_handler">impl_virtual</property>
-            <property name="extra_style" />
-            <property name="fg" />
-            <property name="font" />
+            <property name="extra_style"></property>
+            <property name="fg"></property>
+            <property name="font"></property>
             <property name="hidden">0</property>
             <property name="id">wxID_ANY</property>
-            <property name="maximum_size" />
+            <property name="maximum_size"></property>
             <property name="minimum_size">-1,-1</property>
             <property name="name">DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE</property>
-            <property name="pos" />
+            <property name="pos"></property>
             <property name="size">-1,-1</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU</property>
             <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
             <property name="title">Graphic Item Properties</property>
-            <property name="tooltip" />
-            <property name="window_extra_style" />
-            <property name="window_name" />
-            <property name="window_style" />
-            <event name="OnActivate" />
-            <event name="OnActivateApp" />
-            <event name="OnAuiFindManager" />
-            <event name="OnAuiPaneButton" />
-            <event name="OnAuiPaneClose" />
-            <event name="OnAuiPaneMaximize" />
-            <event name="OnAuiPaneRestore" />
-            <event name="OnAuiRender" />
-            <event name="OnChar" />
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style"></property>
+            <event name="OnActivate"></event>
+            <event name="OnActivateApp"></event>
+            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneButton"></event>
+            <event name="OnAuiPaneClose"></event>
+            <event name="OnAuiPaneMaximize"></event>
+            <event name="OnAuiPaneRestore"></event>
+            <event name="OnAuiRender"></event>
+            <event name="OnChar"></event>
             <event name="OnClose">OnClose</event>
-            <event name="OnEnterWindow" />
-            <event name="OnEraseBackground" />
-            <event name="OnHibernate" />
-            <event name="OnIconize" />
-            <event name="OnIdle" />
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize"></event>
+            <event name="OnIdle"></event>
             <event name="OnInitDialog">OnInitDlg</event>
-            <event name="OnKeyDown" />
-            <event name="OnKeyUp" />
-            <event name="OnKillFocus" />
-            <event name="OnLeaveWindow" />
-            <event name="OnLeftDClick" />
-            <event name="OnLeftDown" />
-            <event name="OnLeftUp" />
-            <event name="OnMiddleDClick" />
-            <event name="OnMiddleDown" />
-            <event name="OnMiddleUp" />
-            <event name="OnMotion" />
-            <event name="OnMouseEvents" />
-            <event name="OnMouseWheel" />
-            <event name="OnPaint" />
-            <event name="OnRightDClick" />
-            <event name="OnRightDown" />
-            <event name="OnRightUp" />
-            <event name="OnSetFocus" />
-            <event name="OnSize" />
-            <event name="OnUpdateUI" />
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
             <object class="wxBoxSizer" expanded="1">
-                <property name="minimum_size" />
+                <property name="minimum_size"></property>
                 <property name="name">bMainSizer</property>
                 <property name="orient">wxVERTICAL</property>
                 <property name="permission">none</property>
                 <object class="sizeritem" expanded="1">
-                    <property name="border">10</property>
+                    <property name="border">5</property>
                     <property name="flag">wxEXPAND|wxALL</property>
                     <property name="proportion">1</property>
                     <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size" />
+                        <property name="minimum_size"></property>
                         <property name="name">bUpperSizer</property>
-                        <property name="orient">wxHORIZONTAL</property>
+                        <property name="orient">wxVERTICAL</property>
                         <property name="permission">none</property>
                         <object class="sizeritem" expanded="1">
-                            <property name="border">30</property>
-                            <property name="flag">wxEXPAND|wxRIGHT</property>
+                            <property name="border">20</property>
+                            <property name="flag">wxEXPAND|wxBOTTOM</property>
                             <property name="proportion">1</property>
-                            <object class="wxFlexGridSizer" expanded="1">
-                                <property name="cols">3</property>
+                            <object class="wxGridBagSizer" expanded="1">
+                                <property name="empty_cell_size">5,5</property>
                                 <property name="flexible_direction">wxBOTH</property>
-                                <property name="growablecols">1</property>
-                                <property name="growablerows" />
-                                <property name="hgap">0</property>
-                                <property name="minimum_size" />
-                                <property name="name">m_fgUpperLeftGridSizer</property>
+                                <property name="growablecols"></property>
+                                <property name="growablerows"></property>
+                                <property name="hgap">5</property>
+                                <property name="minimum_size"></property>
+                                <property name="name">m_sizerLeft</property>
                                 <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                 <property name="permission">protected</property>
-                                <property name="rows">8</property>
-                                <property name="vgap">0</property>
-                                <object class="sizeritem" expanded="0">
+                                <property name="vgap">5</property>
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">3</property>
+                                    <property name="column">0</property>
+                                    <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
+                                    <property name="row">0</property>
+                                    <property name="rowspan">1</property>
+                                    <object class="wxStaticText" expanded="1">
+                                        <property name="BottomDockable">1</property>
+                                        <property name="LeftDockable">1</property>
+                                        <property name="RightDockable">1</property>
+                                        <property name="TopDockable">1</property>
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</property>
+                                        <property name="center_pane">0</property>
+                                        <property name="close_button">1</property>
+                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
+                                        <property name="default_pane">0</property>
+                                        <property name="dock">Dock</property>
+                                        <property name="dock_fixed">0</property>
+                                        <property name="docking">Left</property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="floatable">1</property>
+                                        <property name="font"></property>
+                                        <property name="gripper">0</property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Start Point</property>
+                                        <property name="max_size"></property>
+                                        <property name="maximize_button">0</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
+                                        <property name="minimize_button">0</property>
+                                        <property name="minimum_size"></property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_startPointLabel</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass">; forward_declare</property>
+                                        <property name="toolbar_pane">0</property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <property name="wrap">-1</property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="gbsizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">0</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
+                                    <property name="row">1</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="0">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">0</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Start point X:</property>
-                                        <property name="max_size" />
+                                        <property name="label">X:</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_startXLabel</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="0">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">1</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">1</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxTextCtrl" expanded="0">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="max_size" />
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
+                                        <property name="maximum_size"></property>
                                         <property name="maxlength">0</property>
-                                        <property name="min_size" />
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_startXCtrl</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
                                         <property name="subclass">; ; forward_declare</property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="validator_data_type" />
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
                                         <property name="validator_style">wxFILTER_NONE</property>
                                         <property name="validator_type">wxDefaultValidator</property>
-                                        <property name="validator_variable" />
-                                        <property name="value" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnText" />
-                                        <event name="OnTextEnter" />
-                                        <event name="OnTextMaxLen" />
-                                        <event name="OnTextURL" />
-                                        <event name="OnUpdateUI" />
+                                        <property name="validator_variable"></property>
+                                        <property name="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter"></event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                    <property name="proportion">0</property>
+                                <object class="gbsizeritem" expanded="1">
+                                    <property name="border">15</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">2</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
+                                    <property name="row">1</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Unit</property>
-                                        <property name="max_size" />
+                                        <property name="label">unit</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_startXUnits</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="0">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">0</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
+                                    <property name="row">2</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="0">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">0</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Start point Y:</property>
-                                        <property name="max_size" />
+                                        <property name="label">Y:</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_startYLabel</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="0">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">1</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">2</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxTextCtrl" expanded="0">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="max_size" />
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
+                                        <property name="maximum_size"></property>
                                         <property name="maxlength">0</property>
-                                        <property name="min_size" />
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_startYCtrl</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
                                         <property name="subclass">; ; forward_declare</property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="validator_data_type" />
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
                                         <property name="validator_style">wxFILTER_NONE</property>
                                         <property name="validator_type">wxDefaultValidator</property>
-                                        <property name="validator_variable" />
-                                        <property name="value" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnText" />
-                                        <event name="OnTextEnter" />
-                                        <event name="OnTextMaxLen" />
-                                        <event name="OnTextURL" />
-                                        <event name="OnUpdateUI" />
+                                        <property name="validator_variable"></property>
+                                        <property name="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter"></event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                    <property name="proportion">0</property>
+                                <object class="gbsizeritem" expanded="1">
+                                    <property name="border">15</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">2</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
+                                    <property name="row">2</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Unit</property>
-                                        <property name="max_size" />
+                                        <property name="label">unit</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_startYUnits</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="0">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">3</property>
+                                    <property name="column">3</property>
+                                    <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
+                                    <property name="row">0</property>
+                                    <property name="rowspan">1</property>
+                                    <object class="wxStaticText" expanded="1">
+                                        <property name="BottomDockable">1</property>
+                                        <property name="LeftDockable">1</property>
+                                        <property name="RightDockable">1</property>
+                                        <property name="TopDockable">1</property>
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</property>
+                                        <property name="center_pane">0</property>
+                                        <property name="close_button">1</property>
+                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
+                                        <property name="default_pane">0</property>
+                                        <property name="dock">Dock</property>
+                                        <property name="dock_fixed">0</property>
+                                        <property name="docking">Left</property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="floatable">1</property>
+                                        <property name="font"></property>
+                                        <property name="gripper">0</property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">End Point</property>
+                                        <property name="max_size"></property>
+                                        <property name="maximize_button">0</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
+                                        <property name="minimize_button">0</property>
+                                        <property name="minimum_size"></property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_endPointLabel</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass">; forward_declare</property>
+                                        <property name="toolbar_pane">0</property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <property name="wrap">-1</property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="gbsizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">3</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
+                                    <property name="row">1</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="0">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">0</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">End point X:</property>
-                                        <property name="max_size" />
+                                        <property name="label">X:</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_endXLabel</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="0">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">4</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">1</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxTextCtrl" expanded="0">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="max_size" />
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
+                                        <property name="maximum_size"></property>
                                         <property name="maxlength">0</property>
-                                        <property name="min_size" />
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_endXCtrl</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
                                         <property name="subclass">; ; forward_declare</property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="validator_data_type" />
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
                                         <property name="validator_style">wxFILTER_NONE</property>
                                         <property name="validator_type">wxDefaultValidator</property>
-                                        <property name="validator_variable" />
-                                        <property name="value" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnText" />
-                                        <event name="OnTextEnter" />
-                                        <event name="OnTextMaxLen" />
-                                        <event name="OnTextURL" />
-                                        <event name="OnUpdateUI" />
+                                        <property name="validator_variable"></property>
+                                        <property name="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter"></event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">5</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
+                                    <property name="row">1</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Unit</property>
-                                        <property name="max_size" />
+                                        <property name="label">unit</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_endXUnits</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="0">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">3</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
+                                    <property name="row">2</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="0">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">0</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">End point Y:</property>
-                                        <property name="max_size" />
+                                        <property name="label">Y:</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_endYLabel</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="0">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxEXPAND|wxLEFT|wxTOP</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">4</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">2</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxTextCtrl" expanded="0">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="max_size" />
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
+                                        <property name="maximum_size"></property>
                                         <property name="maxlength">0</property>
-                                        <property name="min_size" />
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_endYCtrl</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
                                         <property name="subclass">; ; forward_declare</property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="validator_data_type" />
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
                                         <property name="validator_style">wxFILTER_NONE</property>
                                         <property name="validator_type">wxDefaultValidator</property>
-                                        <property name="validator_variable" />
-                                        <property name="value" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnText" />
-                                        <event name="OnTextEnter" />
-                                        <event name="OnTextMaxLen" />
-                                        <event name="OnTextURL" />
-                                        <event name="OnUpdateUI" />
+                                        <property name="validator_variable"></property>
+                                        <property name="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter"></event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">5</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
+                                    <property name="row">2</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Unit</property>
-                                        <property name="max_size" />
+                                        <property name="label">unit</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_endYUnits</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">3</property>
+                                    <property name="column">0</property>
+                                    <property name="flag">wxALIGN_CENTER_HORIZONTAL|wxALL</property>
+                                    <property name="row">4</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Bezier point C1 X:</property>
-                                        <property name="max_size" />
+                                        <property name="label">Bezier Control Pt</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_bezierCtrlPt1Label</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass">; forward_declare</property>
+                                        <property name="toolbar_pane">0</property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <property name="wrap">-1</property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="gbsizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">0</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
+                                    <property name="row">5</property>
+                                    <property name="rowspan">1</property>
+                                    <object class="wxStaticText" expanded="1">
+                                        <property name="BottomDockable">1</property>
+                                        <property name="LeftDockable">1</property>
+                                        <property name="RightDockable">1</property>
+                                        <property name="TopDockable">1</property>
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</property>
+                                        <property name="center_pane">0</property>
+                                        <property name="close_button">1</property>
+                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
+                                        <property name="default_pane">0</property>
+                                        <property name="dock">Dock</property>
+                                        <property name="dock_fixed">0</property>
+                                        <property name="docking">Left</property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="floatable">1</property>
+                                        <property name="font"></property>
+                                        <property name="gripper">0</property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">X:</property>
+                                        <property name="max_size"></property>
+                                        <property name="maximize_button">0</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
+                                        <property name="minimize_button">0</property>
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierPointC1XLabel</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">1</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">5</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxTextCtrl" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="max_size" />
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
+                                        <property name="maximum_size"></property>
                                         <property name="maxlength">0</property>
-                                        <property name="min_size" />
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierC1X_Ctrl</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="validator_data_type" />
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
                                         <property name="validator_style">wxFILTER_NONE</property>
                                         <property name="validator_type">wxDefaultValidator</property>
-                                        <property name="validator_variable" />
-                                        <property name="value" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnText" />
-                                        <event name="OnTextEnter" />
-                                        <event name="OnTextMaxLen" />
-                                        <event name="OnTextURL" />
-                                        <event name="OnUpdateUI" />
+                                        <property name="validator_variable"></property>
+                                        <property name="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter"></event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">2</property>
+                                    <property name="flag">wxRIGHT|wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">5</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Unit</property>
-                                        <property name="max_size" />
+                                        <property name="label">unit</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierPointC1XUnit</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">0</property>
+                                    <property name="flag">wxLEFT|wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">6</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Bezier point C1 Y:</property>
-                                        <property name="max_size" />
+                                        <property name="label">Y:</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierPointC1YLabel</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">1</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">6</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxTextCtrl" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="max_size" />
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
+                                        <property name="maximum_size"></property>
                                         <property name="maxlength">0</property>
-                                        <property name="min_size" />
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierC1Y_Ctrl</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="validator_data_type" />
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
                                         <property name="validator_style">wxFILTER_NONE</property>
                                         <property name="validator_type">wxDefaultValidator</property>
-                                        <property name="validator_variable" />
-                                        <property name="value" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnText" />
-                                        <event name="OnTextEnter" />
-                                        <event name="OnTextMaxLen" />
-                                        <event name="OnTextURL" />
-                                        <event name="OnUpdateUI" />
+                                        <property name="validator_variable"></property>
+                                        <property name="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter"></event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">2</property>
+                                    <property name="flag">wxRIGHT|wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">6</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Unit</property>
-                                        <property name="max_size" />
+                                        <property name="label">unit</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierPointC1YUnit</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">3</property>
+                                    <property name="column">3</property>
+                                    <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>
+                                    <property name="row">4</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Bezier point C2 X:</property>
-                                        <property name="max_size" />
+                                        <property name="label">Bezier Control Pt</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
+                                        <property name="moveable">1</property>
+                                        <property name="name">m_bezierCtrlPt2Label</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass">; forward_declare</property>
+                                        <property name="toolbar_pane">0</property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <property name="wrap">-1</property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="gbsizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">3</property>
+                                    <property name="flag">wxLEFT|wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">5</property>
+                                    <property name="rowspan">1</property>
+                                    <object class="wxStaticText" expanded="1">
+                                        <property name="BottomDockable">1</property>
+                                        <property name="LeftDockable">1</property>
+                                        <property name="RightDockable">1</property>
+                                        <property name="TopDockable">1</property>
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</property>
+                                        <property name="center_pane">0</property>
+                                        <property name="close_button">1</property>
+                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
+                                        <property name="default_pane">0</property>
+                                        <property name="dock">Dock</property>
+                                        <property name="dock_fixed">0</property>
+                                        <property name="docking">Left</property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="floatable">1</property>
+                                        <property name="font"></property>
+                                        <property name="gripper">0</property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">X:</property>
+                                        <property name="max_size"></property>
+                                        <property name="maximize_button">0</property>
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
+                                        <property name="minimize_button">0</property>
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierPointC2XLabel</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">4</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">5</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxTextCtrl" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="max_size" />
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
+                                        <property name="maximum_size"></property>
                                         <property name="maxlength">0</property>
-                                        <property name="min_size" />
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierC2X_Ctrl</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="validator_data_type" />
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
                                         <property name="validator_style">wxFILTER_NONE</property>
                                         <property name="validator_type">wxDefaultValidator</property>
-                                        <property name="validator_variable" />
-                                        <property name="value" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnText" />
-                                        <event name="OnTextEnter" />
-                                        <event name="OnTextMaxLen" />
-                                        <event name="OnTextURL" />
-                                        <event name="OnUpdateUI" />
+                                        <property name="validator_variable"></property>
+                                        <property name="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter"></event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">5</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
+                                    <property name="row">5</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Unit</property>
-                                        <property name="max_size" />
+                                        <property name="label">unit</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierPointC2XUnit</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">3</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL|wxLEFT</property>
+                                    <property name="row">6</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Bezier point C2 Y:</property>
-                                        <property name="max_size" />
+                                        <property name="label">Y:</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierPointC2YLabel</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">4</property>
+                                    <property name="flag">wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">6</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxTextCtrl" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="max_size" />
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
+                                        <property name="maximum_size"></property>
                                         <property name="maxlength">0</property>
-                                        <property name="min_size" />
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierC2Y_Ctrl</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="validator_data_type" />
+                                        <property name="tooltip"></property>
+                                        <property name="validator_data_type"></property>
                                         <property name="validator_style">wxFILTER_NONE</property>
                                         <property name="validator_type">wxDefaultValidator</property>
-                                        <property name="validator_variable" />
-                                        <property name="value" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnText" />
-                                        <event name="OnTextEnter" />
-                                        <event name="OnTextMaxLen" />
-                                        <event name="OnTextURL" />
-                                        <event name="OnUpdateUI" />
+                                        <property name="validator_variable"></property>
+                                        <property name="value"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnText"></event>
+                                        <event name="OnTextEnter"></event>
+                                        <event name="OnTextMaxLen"></event>
+                                        <event name="OnTextURL"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
-                                <object class="sizeritem" expanded="1">
+                                <object class="gbsizeritem" expanded="1">
                                     <property name="border">5</property>
-                                    <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
-                                    <property name="proportion">0</property>
+                                    <property name="colspan">1</property>
+                                    <property name="column">5</property>
+                                    <property name="flag">wxRIGHT|wxALIGN_CENTER_VERTICAL</property>
+                                    <property name="row">6</property>
+                                    <property name="rowspan">1</property>
                                     <object class="wxStaticText" expanded="1">
                                         <property name="BottomDockable">1</property>
                                         <property name="LeftDockable">1</property>
                                         <property name="RightDockable">1</property>
                                         <property name="TopDockable">1</property>
-                                        <property name="aui_layer" />
-                                        <property name="aui_name" />
-                                        <property name="aui_position" />
-                                        <property name="aui_row" />
-                                        <property name="best_size" />
-                                        <property name="bg" />
-                                        <property name="caption" />
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
                                         <property name="caption_visible">1</property>
                                         <property name="center_pane">0</property>
                                         <property name="close_button">1</property>
-                                        <property name="context_help" />
+                                        <property name="context_help"></property>
                                         <property name="context_menu">1</property>
                                         <property name="default_pane">0</property>
                                         <property name="dock">Dock</property>
                                         <property name="dock_fixed">0</property>
                                         <property name="docking">Left</property>
                                         <property name="enabled">1</property>
-                                        <property name="fg" />
+                                        <property name="fg"></property>
                                         <property name="floatable">1</property>
-                                        <property name="font" />
+                                        <property name="font"></property>
                                         <property name="gripper">0</property>
                                         <property name="hidden">0</property>
                                         <property name="id">wxID_ANY</property>
-                                        <property name="label">Unit</property>
-                                        <property name="max_size" />
+                                        <property name="label">unit</property>
+                                        <property name="max_size"></property>
                                         <property name="maximize_button">0</property>
-                                        <property name="maximum_size" />
-                                        <property name="min_size" />
+                                        <property name="maximum_size"></property>
+                                        <property name="min_size"></property>
                                         <property name="minimize_button">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="moveable">1</property>
                                         <property name="name">m_BezierPointC2YUnit</property>
                                         <property name="pane_border">1</property>
-                                        <property name="pane_position" />
-                                        <property name="pane_size" />
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
                                         <property name="permission">protected</property>
                                         <property name="pin_button">1</property>
-                                        <property name="pos" />
+                                        <property name="pos"></property>
                                         <property name="resize">Resizable</property>
                                         <property name="show">1</property>
-                                        <property name="size" />
-                                        <property name="style" />
-                                        <property name="subclass" />
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
                                         <property name="toolbar_pane">0</property>
-                                        <property name="tooltip" />
-                                        <property name="window_extra_style" />
-                                        <property name="window_name" />
-                                        <property name="window_style" />
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
                                         <property name="wrap">-1</property>
-                                        <event name="OnChar" />
-                                        <event name="OnEnterWindow" />
-                                        <event name="OnEraseBackground" />
-                                        <event name="OnKeyDown" />
-                                        <event name="OnKeyUp" />
-                                        <event name="OnKillFocus" />
-                                        <event name="OnLeaveWindow" />
-                                        <event name="OnLeftDClick" />
-                                        <event name="OnLeftDown" />
-                                        <event name="OnLeftUp" />
-                                        <event name="OnMiddleDClick" />
-                                        <event name="OnMiddleDown" />
-                                        <event name="OnMiddleUp" />
-                                        <event name="OnMotion" />
-                                        <event name="OnMouseEvents" />
-                                        <event name="OnMouseWheel" />
-                                        <event name="OnPaint" />
-                                        <event name="OnRightDClick" />
-                                        <event name="OnRightDown" />
-                                        <event name="OnRightUp" />
-                                        <event name="OnSetFocus" />
-                                        <event name="OnSize" />
-                                        <event name="OnUpdateUI" />
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
                                     </object>
                                 </object>
                             </object>
@@ -2181,7 +2596,7 @@
                             <property name="flag">wxEXPAND</property>
                             <property name="proportion">0</property>
                             <object class="wxBoxSizer" expanded="1">
-                                <property name="minimum_size" />
+                                <property name="minimum_size"></property>
                                 <property name="name">bUpperRightSizer</property>
                                 <property name="orient">wxVERTICAL</property>
                                 <property name="permission">none</property>
@@ -2193,526 +2608,526 @@
                                         <property name="cols">3</property>
                                         <property name="flexible_direction">wxBOTH</property>
                                         <property name="growablecols">1</property>
-                                        <property name="growablerows" />
+                                        <property name="growablerows"></property>
                                         <property name="hgap">0</property>
-                                        <property name="minimum_size" />
+                                        <property name="minimum_size"></property>
                                         <property name="name">fgUpperRightGridSizer</property>
                                         <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
                                         <property name="permission">none</property>
                                         <property name="rows">0</property>
-                                        <property name="vgap">0</property>
+                                        <property name="vgap">5</property>
                                         <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxTOP</property>
+                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT</property>
                                             <property name="proportion">0</property>
                                             <object class="wxStaticText" expanded="1">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
-                                                <property name="aui_layer" />
-                                                <property name="aui_name" />
-                                                <property name="aui_position" />
-                                                <property name="aui_row" />
-                                                <property name="best_size" />
-                                                <property name="bg" />
-                                                <property name="caption" />
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
                                                 <property name="caption_visible">1</property>
                                                 <property name="center_pane">0</property>
                                                 <property name="close_button">1</property>
-                                                <property name="context_help" />
+                                                <property name="context_help"></property>
                                                 <property name="context_menu">1</property>
                                                 <property name="default_pane">0</property>
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
                                                 <property name="enabled">1</property>
-                                                <property name="fg" />
+                                                <property name="fg"></property>
                                                 <property name="floatable">1</property>
-                                                <property name="font" />
+                                                <property name="font"></property>
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Arc angle:</property>
-                                                <property name="max_size" />
+                                                <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
-                                                <property name="maximum_size" />
-                                                <property name="min_size" />
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size" />
+                                                <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_angleLabel</property>
                                                 <property name="pane_border">1</property>
-                                                <property name="pane_position" />
-                                                <property name="pane_size" />
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
-                                                <property name="pos" />
+                                                <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size" />
-                                                <property name="style" />
-                                                <property name="subclass" />
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip" />
-                                                <property name="window_extra_style" />
-                                                <property name="window_name" />
-                                                <property name="window_style" />
+                                                <property name="tooltip"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
                                                 <property name="wrap">-1</property>
-                                                <event name="OnChar" />
-                                                <event name="OnEnterWindow" />
-                                                <event name="OnEraseBackground" />
-                                                <event name="OnKeyDown" />
-                                                <event name="OnKeyUp" />
-                                                <event name="OnKillFocus" />
-                                                <event name="OnLeaveWindow" />
-                                                <event name="OnLeftDClick" />
-                                                <event name="OnLeftDown" />
-                                                <event name="OnLeftUp" />
-                                                <event name="OnMiddleDClick" />
-                                                <event name="OnMiddleDown" />
-                                                <event name="OnMiddleUp" />
-                                                <event name="OnMotion" />
-                                                <event name="OnMouseEvents" />
-                                                <event name="OnMouseWheel" />
-                                                <event name="OnPaint" />
-                                                <event name="OnRightDClick" />
-                                                <event name="OnRightDown" />
-                                                <event name="OnRightUp" />
-                                                <event name="OnSetFocus" />
-                                                <event name="OnSize" />
-                                                <event name="OnUpdateUI" />
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL</property>
+                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
                                             <property name="proportion">0</property>
                                             <object class="wxTextCtrl" expanded="1">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
-                                                <property name="aui_layer" />
-                                                <property name="aui_name" />
-                                                <property name="aui_position" />
-                                                <property name="aui_row" />
-                                                <property name="best_size" />
-                                                <property name="bg" />
-                                                <property name="caption" />
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
                                                 <property name="caption_visible">1</property>
                                                 <property name="center_pane">0</property>
                                                 <property name="close_button">1</property>
-                                                <property name="context_help" />
+                                                <property name="context_help"></property>
                                                 <property name="context_menu">1</property>
                                                 <property name="default_pane">0</property>
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
                                                 <property name="enabled">1</property>
-                                                <property name="fg" />
+                                                <property name="fg"></property>
                                                 <property name="floatable">1</property>
-                                                <property name="font" />
+                                                <property name="font"></property>
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="max_size" />
+                                                <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
-                                                <property name="maximum_size" />
+                                                <property name="maximum_size"></property>
                                                 <property name="maxlength">0</property>
-                                                <property name="min_size" />
+                                                <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size" />
+                                                <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_angleCtrl</property>
                                                 <property name="pane_border">1</property>
-                                                <property name="pane_position" />
-                                                <property name="pane_size" />
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
-                                                <property name="pos" />
+                                                <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size" />
-                                                <property name="style" />
+                                                <property name="size"></property>
+                                                <property name="style"></property>
                                                 <property name="subclass">; ; forward_declare</property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip" />
-                                                <property name="validator_data_type" />
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
                                                 <property name="validator_style">wxFILTER_NONE</property>
                                                 <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable" />
-                                                <property name="value" />
-                                                <property name="window_extra_style" />
-                                                <property name="window_name" />
-                                                <property name="window_style" />
-                                                <event name="OnChar" />
-                                                <event name="OnEnterWindow" />
-                                                <event name="OnEraseBackground" />
-                                                <event name="OnKeyDown" />
-                                                <event name="OnKeyUp" />
-                                                <event name="OnKillFocus" />
-                                                <event name="OnLeaveWindow" />
-                                                <event name="OnLeftDClick" />
-                                                <event name="OnLeftDown" />
-                                                <event name="OnLeftUp" />
-                                                <event name="OnMiddleDClick" />
-                                                <event name="OnMiddleDown" />
-                                                <event name="OnMiddleUp" />
-                                                <event name="OnMotion" />
-                                                <event name="OnMouseEvents" />
-                                                <event name="OnMouseWheel" />
-                                                <event name="OnPaint" />
-                                                <event name="OnRightDClick" />
-                                                <event name="OnRightDown" />
-                                                <event name="OnRightUp" />
-                                                <event name="OnSetFocus" />
-                                                <event name="OnSize" />
-                                                <event name="OnText" />
-                                                <event name="OnTextEnter" />
-                                                <event name="OnTextMaxLen" />
-                                                <event name="OnTextURL" />
-                                                <event name="OnUpdateUI" />
+                                                <property name="validator_variable"></property>
+                                                <property name="value"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnText"></event>
+                                                <event name="OnTextEnter"></event>
+                                                <event name="OnTextMaxLen"></event>
+                                                <event name="OnTextURL"></event>
+                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT</property>
+                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT</property>
                                             <property name="proportion">0</property>
                                             <object class="wxStaticText" expanded="1">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
-                                                <property name="aui_layer" />
-                                                <property name="aui_name" />
-                                                <property name="aui_position" />
-                                                <property name="aui_row" />
-                                                <property name="best_size" />
-                                                <property name="bg" />
-                                                <property name="caption" />
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
                                                 <property name="caption_visible">1</property>
                                                 <property name="center_pane">0</property>
                                                 <property name="close_button">1</property>
-                                                <property name="context_help" />
+                                                <property name="context_help"></property>
                                                 <property name="context_menu">1</property>
                                                 <property name="default_pane">0</property>
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
                                                 <property name="enabled">1</property>
-                                                <property name="fg" />
+                                                <property name="fg"></property>
                                                 <property name="floatable">1</property>
-                                                <property name="font" />
+                                                <property name="font"></property>
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">deg</property>
-                                                <property name="max_size" />
+                                                <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
-                                                <property name="maximum_size" />
-                                                <property name="min_size" />
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size" />
+                                                <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_angleUnits</property>
                                                 <property name="pane_border">1</property>
-                                                <property name="pane_position" />
-                                                <property name="pane_size" />
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
-                                                <property name="pos" />
+                                                <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size" />
-                                                <property name="style" />
-                                                <property name="subclass" />
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip" />
-                                                <property name="window_extra_style" />
-                                                <property name="window_name" />
-                                                <property name="window_style" />
+                                                <property name="tooltip"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
                                                 <property name="wrap">-1</property>
-                                                <event name="OnChar" />
-                                                <event name="OnEnterWindow" />
-                                                <event name="OnEraseBackground" />
-                                                <event name="OnKeyDown" />
-                                                <event name="OnKeyUp" />
-                                                <event name="OnKillFocus" />
-                                                <event name="OnLeaveWindow" />
-                                                <event name="OnLeftDClick" />
-                                                <event name="OnLeftDown" />
-                                                <event name="OnLeftUp" />
-                                                <event name="OnMiddleDClick" />
-                                                <event name="OnMiddleDown" />
-                                                <event name="OnMiddleUp" />
-                                                <event name="OnMotion" />
-                                                <event name="OnMouseEvents" />
-                                                <event name="OnMouseWheel" />
-                                                <event name="OnPaint" />
-                                                <event name="OnRightDClick" />
-                                                <event name="OnRightDown" />
-                                                <event name="OnRightUp" />
-                                                <event name="OnSetFocus" />
-                                                <event name="OnSize" />
-                                                <event name="OnUpdateUI" />
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
+                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT</property>
                                             <property name="proportion">0</property>
                                             <object class="wxStaticText" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
-                                                <property name="aui_layer" />
-                                                <property name="aui_name" />
-                                                <property name="aui_position" />
-                                                <property name="aui_row" />
-                                                <property name="best_size" />
-                                                <property name="bg" />
-                                                <property name="caption" />
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
                                                 <property name="caption_visible">1</property>
                                                 <property name="center_pane">0</property>
                                                 <property name="close_button">1</property>
-                                                <property name="context_help" />
+                                                <property name="context_help"></property>
                                                 <property name="context_menu">0</property>
                                                 <property name="default_pane">0</property>
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
                                                 <property name="enabled">1</property>
-                                                <property name="fg" />
+                                                <property name="fg"></property>
                                                 <property name="floatable">1</property>
-                                                <property name="font" />
+                                                <property name="font"></property>
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Line thickness:</property>
-                                                <property name="max_size" />
+                                                <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
-                                                <property name="maximum_size" />
-                                                <property name="min_size" />
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size" />
+                                                <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_thicknessLabel</property>
                                                 <property name="pane_border">1</property>
-                                                <property name="pane_position" />
-                                                <property name="pane_size" />
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
-                                                <property name="pos" />
+                                                <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size" />
-                                                <property name="style" />
-                                                <property name="subclass" />
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip" />
-                                                <property name="window_extra_style" />
-                                                <property name="window_name" />
-                                                <property name="window_style" />
+                                                <property name="tooltip"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
                                                 <property name="wrap">-1</property>
-                                                <event name="OnChar" />
-                                                <event name="OnEnterWindow" />
-                                                <event name="OnEraseBackground" />
-                                                <event name="OnKeyDown" />
-                                                <event name="OnKeyUp" />
-                                                <event name="OnKillFocus" />
-                                                <event name="OnLeaveWindow" />
-                                                <event name="OnLeftDClick" />
-                                                <event name="OnLeftDown" />
-                                                <event name="OnLeftUp" />
-                                                <event name="OnMiddleDClick" />
-                                                <event name="OnMiddleDown" />
-                                                <event name="OnMiddleUp" />
-                                                <event name="OnMotion" />
-                                                <event name="OnMouseEvents" />
-                                                <event name="OnMouseWheel" />
-                                                <event name="OnPaint" />
-                                                <event name="OnRightDClick" />
-                                                <event name="OnRightDown" />
-                                                <event name="OnRightUp" />
-                                                <event name="OnSetFocus" />
-                                                <event name="OnSize" />
-                                                <event name="OnUpdateUI" />
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL</property>
+                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
                                             <property name="proportion">0</property>
                                             <object class="wxTextCtrl" expanded="0">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
-                                                <property name="aui_layer" />
-                                                <property name="aui_name" />
-                                                <property name="aui_position" />
-                                                <property name="aui_row" />
-                                                <property name="best_size" />
-                                                <property name="bg" />
-                                                <property name="caption" />
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
                                                 <property name="caption_visible">1</property>
                                                 <property name="center_pane">0</property>
                                                 <property name="close_button">1</property>
-                                                <property name="context_help" />
+                                                <property name="context_help"></property>
                                                 <property name="context_menu">1</property>
                                                 <property name="default_pane">0</property>
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
                                                 <property name="enabled">1</property>
-                                                <property name="fg" />
+                                                <property name="fg"></property>
                                                 <property name="floatable">1</property>
-                                                <property name="font" />
+                                                <property name="font"></property>
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="max_size" />
+                                                <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
-                                                <property name="maximum_size" />
+                                                <property name="maximum_size"></property>
                                                 <property name="maxlength">0</property>
-                                                <property name="min_size" />
+                                                <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size" />
+                                                <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_thicknessCtrl</property>
                                                 <property name="pane_border">1</property>
-                                                <property name="pane_position" />
-                                                <property name="pane_size" />
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
-                                                <property name="pos" />
+                                                <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size" />
-                                                <property name="style" />
-                                                <property name="subclass" />
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip" />
-                                                <property name="validator_data_type" />
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
                                                 <property name="validator_style">wxFILTER_NONE</property>
                                                 <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable" />
-                                                <property name="value" />
-                                                <property name="window_extra_style" />
-                                                <property name="window_name" />
-                                                <property name="window_style" />
-                                                <event name="OnChar" />
-                                                <event name="OnEnterWindow" />
-                                                <event name="OnEraseBackground" />
-                                                <event name="OnKeyDown" />
-                                                <event name="OnKeyUp" />
-                                                <event name="OnKillFocus" />
-                                                <event name="OnLeaveWindow" />
-                                                <event name="OnLeftDClick" />
-                                                <event name="OnLeftDown" />
-                                                <event name="OnLeftUp" />
-                                                <event name="OnMiddleDClick" />
-                                                <event name="OnMiddleDown" />
-                                                <event name="OnMiddleUp" />
-                                                <event name="OnMotion" />
-                                                <event name="OnMouseEvents" />
-                                                <event name="OnMouseWheel" />
-                                                <event name="OnPaint" />
-                                                <event name="OnRightDClick" />
-                                                <event name="OnRightDown" />
-                                                <event name="OnRightUp" />
-                                                <event name="OnSetFocus" />
-                                                <event name="OnSize" />
-                                                <event name="OnText" />
-                                                <event name="OnTextEnter" />
-                                                <event name="OnTextMaxLen" />
-                                                <event name="OnTextURL" />
-                                                <event name="OnUpdateUI" />
+                                                <property name="validator_variable"></property>
+                                                <property name="value"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnText"></event>
+                                                <event name="OnTextEnter"></event>
+                                                <event name="OnTextMaxLen"></event>
+                                                <event name="OnTextURL"></event>
+                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="1">
                                             <property name="border">5</property>
-                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT</property>
+                                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT</property>
                                             <property name="proportion">0</property>
                                             <object class="wxStaticText" expanded="1">
                                                 <property name="BottomDockable">1</property>
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
-                                                <property name="aui_layer" />
-                                                <property name="aui_name" />
-                                                <property name="aui_position" />
-                                                <property name="aui_row" />
-                                                <property name="best_size" />
-                                                <property name="bg" />
-                                                <property name="caption" />
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
                                                 <property name="caption_visible">1</property>
                                                 <property name="center_pane">0</property>
                                                 <property name="close_button">1</property>
-                                                <property name="context_help" />
+                                                <property name="context_help"></property>
                                                 <property name="context_menu">1</property>
                                                 <property name="default_pane">0</property>
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
                                                 <property name="enabled">1</property>
-                                                <property name="fg" />
+                                                <property name="fg"></property>
                                                 <property name="floatable">1</property>
-                                                <property name="font" />
+                                                <property name="font"></property>
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">Unit</property>
-                                                <property name="max_size" />
+                                                <property name="label">unit</property>
+                                                <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
-                                                <property name="maximum_size" />
-                                                <property name="min_size" />
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size" />
+                                                <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_thicknessUnits</property>
                                                 <property name="pane_border">1</property>
-                                                <property name="pane_position" />
-                                                <property name="pane_size" />
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
-                                                <property name="pos" />
+                                                <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size" />
-                                                <property name="style" />
-                                                <property name="subclass" />
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip" />
-                                                <property name="window_extra_style" />
-                                                <property name="window_name" />
-                                                <property name="window_style" />
+                                                <property name="tooltip"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
                                                 <property name="wrap">-1</property>
-                                                <event name="OnChar" />
-                                                <event name="OnEnterWindow" />
-                                                <event name="OnEraseBackground" />
-                                                <event name="OnKeyDown" />
-                                                <event name="OnKeyUp" />
-                                                <event name="OnKillFocus" />
-                                                <event name="OnLeaveWindow" />
-                                                <event name="OnLeftDClick" />
-                                                <event name="OnLeftDown" />
-                                                <event name="OnLeftUp" />
-                                                <event name="OnMiddleDClick" />
-                                                <event name="OnMiddleDown" />
-                                                <event name="OnMiddleUp" />
-                                                <event name="OnMotion" />
-                                                <event name="OnMouseEvents" />
-                                                <event name="OnMouseWheel" />
-                                                <event name="OnPaint" />
-                                                <event name="OnRightDClick" />
-                                                <event name="OnRightDown" />
-                                                <event name="OnRightUp" />
-                                                <event name="OnSetFocus" />
-                                                <event name="OnSize" />
-                                                <event name="OnUpdateUI" />
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="0">
@@ -2724,78 +3139,78 @@
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
-                                                <property name="aui_layer" />
-                                                <property name="aui_name" />
-                                                <property name="aui_position" />
-                                                <property name="aui_row" />
-                                                <property name="best_size" />
-                                                <property name="bg" />
-                                                <property name="caption" />
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
                                                 <property name="caption_visible">1</property>
                                                 <property name="center_pane">0</property>
                                                 <property name="close_button">1</property>
-                                                <property name="context_help" />
+                                                <property name="context_help"></property>
                                                 <property name="context_menu">0</property>
                                                 <property name="default_pane">0</property>
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
                                                 <property name="enabled">1</property>
-                                                <property name="fg" />
+                                                <property name="fg"></property>
                                                 <property name="floatable">1</property>
-                                                <property name="font" />
+                                                <property name="font"></property>
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Layer:</property>
-                                                <property name="max_size" />
+                                                <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
-                                                <property name="maximum_size" />
-                                                <property name="min_size" />
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size" />
+                                                <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_LayerLabel</property>
                                                 <property name="pane_border">1</property>
-                                                <property name="pane_position" />
-                                                <property name="pane_size" />
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
-                                                <property name="pos" />
+                                                <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="show">1</property>
-                                                <property name="size" />
-                                                <property name="style" />
-                                                <property name="subclass" />
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip" />
-                                                <property name="window_extra_style" />
-                                                <property name="window_name" />
-                                                <property name="window_style" />
+                                                <property name="tooltip"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
                                                 <property name="wrap">-1</property>
-                                                <event name="OnChar" />
-                                                <event name="OnEnterWindow" />
-                                                <event name="OnEraseBackground" />
-                                                <event name="OnKeyDown" />
-                                                <event name="OnKeyUp" />
-                                                <event name="OnKillFocus" />
-                                                <event name="OnLeaveWindow" />
-                                                <event name="OnLeftDClick" />
-                                                <event name="OnLeftDown" />
-                                                <event name="OnLeftUp" />
-                                                <event name="OnMiddleDClick" />
-                                                <event name="OnMiddleDown" />
-                                                <event name="OnMiddleUp" />
-                                                <event name="OnMotion" />
-                                                <event name="OnMouseEvents" />
-                                                <event name="OnMouseWheel" />
-                                                <event name="OnPaint" />
-                                                <event name="OnRightDClick" />
-                                                <event name="OnRightDown" />
-                                                <event name="OnRightUp" />
-                                                <event name="OnSetFocus" />
-                                                <event name="OnSize" />
-                                                <event name="OnUpdateUI" />
+                                                <event name="OnChar"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="1">
@@ -2807,86 +3222,86 @@
                                                 <property name="LeftDockable">1</property>
                                                 <property name="RightDockable">1</property>
                                                 <property name="TopDockable">1</property>
-                                                <property name="aui_layer" />
-                                                <property name="aui_name" />
-                                                <property name="aui_position" />
-                                                <property name="aui_row" />
-                                                <property name="best_size" />
-                                                <property name="bg" />
-                                                <property name="caption" />
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
                                                 <property name="caption_visible">1</property>
                                                 <property name="center_pane">0</property>
-                                                <property name="choices" />
+                                                <property name="choices"></property>
                                                 <property name="close_button">1</property>
-                                                <property name="context_help" />
+                                                <property name="context_help"></property>
                                                 <property name="context_menu">1</property>
                                                 <property name="default_pane">0</property>
                                                 <property name="dock">Dock</property>
                                                 <property name="dock_fixed">0</property>
                                                 <property name="docking">Left</property>
                                                 <property name="enabled">1</property>
-                                                <property name="fg" />
+                                                <property name="fg"></property>
                                                 <property name="floatable">1</property>
-                                                <property name="font" />
+                                                <property name="font"></property>
                                                 <property name="gripper">0</property>
                                                 <property name="hidden">0</property>
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="max_size" />
+                                                <property name="max_size"></property>
                                                 <property name="maximize_button">0</property>
-                                                <property name="maximum_size" />
-                                                <property name="min_size" />
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
                                                 <property name="minimize_button">0</property>
-                                                <property name="minimum_size" />
+                                                <property name="minimum_size"></property>
                                                 <property name="moveable">1</property>
                                                 <property name="name">m_LayerSelectionCtrl</property>
                                                 <property name="pane_border">1</property>
-                                                <property name="pane_position" />
-                                                <property name="pane_size" />
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
                                                 <property name="permission">protected</property>
                                                 <property name="pin_button">1</property>
-                                                <property name="pos" />
+                                                <property name="pos"></property>
                                                 <property name="resize">Resizable</property>
                                                 <property name="selection">-1</property>
                                                 <property name="show">1</property>
-                                                <property name="size" />
-                                                <property name="style" />
+                                                <property name="size"></property>
+                                                <property name="style"></property>
                                                 <property name="subclass">PCB_LAYER_BOX_SELECTOR; pcb_layer_box_selector.h</property>
                                                 <property name="toolbar_pane">0</property>
-                                                <property name="tooltip" />
-                                                <property name="validator_data_type" />
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
                                                 <property name="validator_style">wxFILTER_NONE</property>
                                                 <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable" />
-                                                <property name="value" />
-                                                <property name="window_extra_style" />
-                                                <property name="window_name" />
-                                                <property name="window_style" />
-                                                <event name="OnChar" />
-                                                <event name="OnCombobox" />
-                                                <event name="OnEnterWindow" />
-                                                <event name="OnEraseBackground" />
-                                                <event name="OnKeyDown" />
-                                                <event name="OnKeyUp" />
-                                                <event name="OnKillFocus" />
-                                                <event name="OnLeaveWindow" />
-                                                <event name="OnLeftDClick" />
-                                                <event name="OnLeftDown" />
-                                                <event name="OnLeftUp" />
-                                                <event name="OnMiddleDClick" />
-                                                <event name="OnMiddleDown" />
-                                                <event name="OnMiddleUp" />
-                                                <event name="OnMotion" />
-                                                <event name="OnMouseEvents" />
-                                                <event name="OnMouseWheel" />
-                                                <event name="OnPaint" />
-                                                <event name="OnRightDClick" />
-                                                <event name="OnRightDown" />
-                                                <event name="OnRightUp" />
-                                                <event name="OnSetFocus" />
-                                                <event name="OnSize" />
-                                                <event name="OnText" />
-                                                <event name="OnTextEnter" />
-                                                <event name="OnUpdateUI" />
+                                                <property name="validator_variable"></property>
+                                                <property name="value"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnCombobox"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnText"></event>
+                                                <event name="OnTextEnter"></event>
+                                                <event name="OnUpdateUI"></event>
                                             </object>
                                         </object>
                                         <object class="sizeritem" expanded="1">
@@ -2914,76 +3329,76 @@
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
                         <property name="TopDockable">1</property>
-                        <property name="aui_layer" />
-                        <property name="aui_name" />
-                        <property name="aui_position" />
-                        <property name="aui_row" />
-                        <property name="best_size" />
-                        <property name="bg" />
-                        <property name="caption" />
+                        <property name="aui_layer"></property>
+                        <property name="aui_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
                         <property name="caption_visible">1</property>
                         <property name="center_pane">0</property>
                         <property name="close_button">1</property>
-                        <property name="context_help" />
+                        <property name="context_help"></property>
                         <property name="context_menu">1</property>
                         <property name="default_pane">0</property>
                         <property name="dock">Dock</property>
                         <property name="dock_fixed">0</property>
                         <property name="docking">Left</property>
                         <property name="enabled">1</property>
-                        <property name="fg" />
+                        <property name="fg"></property>
                         <property name="floatable">1</property>
-                        <property name="font" />
+                        <property name="font"></property>
                         <property name="gripper">0</property>
                         <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
-                        <property name="max_size" />
+                        <property name="max_size"></property>
                         <property name="maximize_button">0</property>
-                        <property name="maximum_size" />
-                        <property name="min_size" />
+                        <property name="maximum_size"></property>
+                        <property name="min_size"></property>
                         <property name="minimize_button">0</property>
-                        <property name="minimum_size" />
+                        <property name="minimum_size"></property>
                         <property name="moveable">1</property>
                         <property name="name">m_staticline1</property>
                         <property name="pane_border">1</property>
-                        <property name="pane_position" />
-                        <property name="pane_size" />
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
                         <property name="permission">protected</property>
                         <property name="pin_button">1</property>
-                        <property name="pos" />
+                        <property name="pos"></property>
                         <property name="resize">Resizable</property>
                         <property name="show">1</property>
-                        <property name="size" />
+                        <property name="size"></property>
                         <property name="style">wxLI_HORIZONTAL</property>
-                        <property name="subclass" />
+                        <property name="subclass"></property>
                         <property name="toolbar_pane">0</property>
-                        <property name="tooltip" />
-                        <property name="window_extra_style" />
-                        <property name="window_name" />
-                        <property name="window_style" />
-                        <event name="OnChar" />
-                        <event name="OnEnterWindow" />
-                        <event name="OnEraseBackground" />
-                        <event name="OnKeyDown" />
-                        <event name="OnKeyUp" />
-                        <event name="OnKillFocus" />
-                        <event name="OnLeaveWindow" />
-                        <event name="OnLeftDClick" />
-                        <event name="OnLeftDown" />
-                        <event name="OnLeftUp" />
-                        <event name="OnMiddleDClick" />
-                        <event name="OnMiddleDown" />
-                        <event name="OnMiddleUp" />
-                        <event name="OnMotion" />
-                        <event name="OnMouseEvents" />
-                        <event name="OnMouseWheel" />
-                        <event name="OnPaint" />
-                        <event name="OnRightDClick" />
-                        <event name="OnRightDown" />
-                        <event name="OnRightUp" />
-                        <event name="OnSetFocus" />
-                        <event name="OnSize" />
-                        <event name="OnUpdateUI" />
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
                     </object>
                 </object>
                 <object class="sizeritem" expanded="1">
@@ -2999,17 +3414,17 @@
                         <property name="OK">1</property>
                         <property name="Save">0</property>
                         <property name="Yes">0</property>
-                        <property name="minimum_size" />
+                        <property name="minimum_size"></property>
                         <property name="name">m_StandardButtonsSizer</property>
                         <property name="permission">protected</property>
-                        <event name="OnApplyButtonClick" />
-                        <event name="OnCancelButtonClick" />
-                        <event name="OnContextHelpButtonClick" />
-                        <event name="OnHelpButtonClick" />
-                        <event name="OnNoButtonClick" />
-                        <event name="OnOKButtonClick" />
-                        <event name="OnSaveButtonClick" />
-                        <event name="OnYesButtonClick" />
+                        <event name="OnApplyButtonClick"></event>
+                        <event name="OnCancelButtonClick"></event>
+                        <event name="OnContextHelpButtonClick"></event>
+                        <event name="OnHelpButtonClick"></event>
+                        <event name="OnNoButtonClick"></event>
+                        <event name="OnOKButtonClick"></event>
+                        <event name="OnSaveButtonClick"></event>
+                        <event name="OnYesButtonClick"></event>
                     </object>
                 </object>
             </object>
diff --git a/pcbnew/dialogs/dialog_graphic_item_properties_base.h b/pcbnew/dialogs/dialog_graphic_item_properties_base.h
index dc81e63971..1ab91dede3 100644
--- a/pcbnew/dialogs/dialog_graphic_item_properties_base.h
+++ b/pcbnew/dialogs/dialog_graphic_item_properties_base.h
@@ -21,8 +21,9 @@ class PCB_LAYER_BOX_SELECTOR;
 #include <wx/colour.h>
 #include <wx/settings.h>
 #include <wx/textctrl.h>
-#include <wx/sizer.h>
+#include <wx/gbsizer.h>
 #include <wx/bmpcbox.h>
+#include <wx/sizer.h>
 #include <wx/statline.h>
 #include <wx/button.h>
 #include <wx/dialog.h>
@@ -38,25 +39,29 @@ class DIALOG_GRAPHIC_ITEM_PROPERTIES_BASE : public DIALOG_SHIM
 	private:
 	
 	protected:
-		wxFlexGridSizer* m_fgUpperLeftGridSizer;
+		wxGridBagSizer* m_sizerLeft;
+		wxStaticText* m_startPointLabel;
 		wxStaticText* m_startXLabel;
 		wxTextCtrl* m_startXCtrl;
 		wxStaticText* m_startXUnits;
 		wxStaticText* m_startYLabel;
 		wxTextCtrl* m_startYCtrl;
 		wxStaticText* m_startYUnits;
+		wxStaticText* m_endPointLabel;
 		wxStaticText* m_endXLabel;
 		wxTextCtrl* m_endXCtrl;
 		wxStaticText* m_endXUnits;
 		wxStaticText* m_endYLabel;
 		wxTextCtrl* m_endYCtrl;
 		wxStaticText* m_endYUnits;
+		wxStaticText* m_bezierCtrlPt1Label;
 		wxStaticText* m_BezierPointC1XLabel;
 		wxTextCtrl* m_BezierC1X_Ctrl;
 		wxStaticText* m_BezierPointC1XUnit;
 		wxStaticText* m_BezierPointC1YLabel;
 		wxTextCtrl* m_BezierC1Y_Ctrl;
 		wxStaticText* m_BezierPointC1YUnit;
+		wxStaticText* m_bezierCtrlPt2Label;
 		wxStaticText* m_BezierPointC2XLabel;
 		wxTextCtrl* m_BezierC2X_Ctrl;
 		wxStaticText* m_BezierPointC2XUnit;