diff --git a/comp/src/gb.gui.base/.src/Split/Splitter.class b/comp/src/gb.gui.base/.src/Split/Splitter.class
index c792d20ad..f19660efe 100644
--- a/comp/src/gb.gui.base/.src/Split/Splitter.class
+++ b/comp/src/gb.gui.base/.src/Split/Splitter.class
@@ -386,11 +386,12 @@ Public Sub Resize_MouseMove()
   ' [0 -> I] / [I + 1 -> N - 1]
   
   XMin = (S + 1) * ($iMinSize + SW) - SW
-  XMax = $hPanel.W - (($aLayout.Count - S - 1) * ($iMinSize + SW) - SW)
   
   If $bVertical Then
+    XMax = $hPanel.H - (($aLayout.Count - S - 1) * ($iMinSize + SW) - SW)
     X = Mouse.ScreenY - $hPanel.ScreenY - Mouse.StartY + Desktop.Scale \ 2
   Else 
+    XMax = $hPanel.W - (($aLayout.Count - S - 1) * ($iMinSize + SW) - SW)
     X = Mouse.ScreenX - $hPanel.ScreenX - Mouse.StartX + Desktop.Scale \ 2
   Endif
   
@@ -538,3 +539,16 @@ Private Sub Arrangement_Write(Value As Integer)
   UpdateMouse
 
 End
+
+Public Sub Resize_DblClick()
+
+  Dim aLayout As Integer[]
+  Dim I As Integer
+  
+  aLayout = Layout_Read()
+  For I = 0 To aLayout.Max
+    If aLayout[I] Then aLayout[I] = 1
+  Next
+  Layout_Write(aLayout)
+  
+End
diff --git a/comp/src/gb.gui.base/.src/TreeView/_ColumnView_Columns.class b/comp/src/gb.gui.base/.src/TreeView/_ColumnView_Columns.class
index a7fb2a066..ba53d2ad6 100644
--- a/comp/src/gb.gui.base/.src/TreeView/_ColumnView_Columns.class
+++ b/comp/src/gb.gui.base/.src/TreeView/_ColumnView_Columns.class
@@ -6,6 +6,7 @@ Property Count As Integer
 Property Read Max As Integer
 Property Sort As Integer
 Property Ascending As Boolean
+Property Padding As Integer
 
 Event _Refresh
 
@@ -64,3 +65,15 @@ Private Function Max_Read() As Integer
   Return Count_Read() - 1
 
 End
+
+Private Function Padding_Read() As Integer
+
+  Return GetView().Columns.Padding
+
+End
+
+Private Sub Padding_Write(Value As Integer)
+
+  GetView().Columns.Padding = Value
+
+End
diff --git a/comp/src/gb.gui.base/.src/TreeView/_TreeView.class b/comp/src/gb.gui.base/.src/TreeView/_TreeView.class
index 9c272e21f..3691291ac 100644
--- a/comp/src/gb.gui.base/.src/TreeView/_TreeView.class
+++ b/comp/src/gb.gui.base/.src/TreeView/_TreeView.class
@@ -784,10 +784,10 @@ Public Sub GridView_Draw(X As Integer, Y As Integer, W As Integer, H As Integer,
     
   Else
     
-    If Me Is ColumnView Then
-      X += Desktop.Scale
-      W -= Desktop.Scale * 2
-    Endif
+    ' If Me Is ColumnView Then
+    '   X += Desktop.Scale
+    '   W -= Desktop.Scale * 2
+    ' Endif
     If hItem.Foreground <> Color.Default Then Paint.Background = hItem.Foreground
     Paint.DrawText(hItem[Column], X, Y, W, H, $hView.Columns[Column].Alignment)
     
@@ -1512,9 +1512,11 @@ Private Sub UpdateRenameBox() As Boolean
   Else
     X = $hView.Columns[$iColRenaming].X - $hView.ScrollX
     W = Min($hView.ClientW - X, $hView.Columns[$iColRenaming].Width)
+    X += $hView.Padding + $hView.Columns.Padding - 2
+    W -= ($hView.Padding + $hView.Columns.Padding) * 2 - 4
   Endif
   
-  If W < 32 Then 
+  If W < Desktop.Scale * 4 Then 
     Cancel
     Return
   Endif