--- a/UIPainter.st	Mon Jan 19 12:08:57 1998 +0100
+++ b/UIPainter.st	Mon Jan 19 12:57:09 1998 +0100
@@ -676,11 +676,11 @@
           #'window:' 
            #(#WindowSpec
               #'name:' 'Tree-View'
-              #'layout:' #(#LayoutFrame 30 0 56 0 543 0 516 0)
+              #'layout:' #(#LayoutFrame 61 0 445 0 574 0 905 0)
               #'label:' 'Tree-View'
               #'min:' #(#Point 10 10)
               #'max:' #(#Point 1160 870)
-              #'bounds:' #(#Rectangle 30 56 544 517)
+              #'bounds:' #(#Rectangle 61 445 575 906)
               #'usePreferredExtent:' false
           )
           #'component:' 
@@ -707,7 +707,7 @@
                               #'tabable:' true
                               #'menu:' #menuChangeHierarchy
                               #'showSeparatingLines:' true
-                              #'extent:' #(#Point 103 32)
+                              #'extent:' #(#Point 120 30)
                           )
                            #(#MenuPanelSpec
                               #'name:' 'menuAlignment'
@@ -716,7 +716,7 @@
                               #'tabable:' true
                               #'menu:' #menuAlignment
                               #'showSeparatingLines:' true
-                              #'extent:' #(#Point 233 32)
+                              #'extent:' #(#Point 244 30)
                           )
                            #(#HorizontalPanelViewSpec
                               #'name:' 'panelViewButtons'
@@ -831,7 +831,7 @@
                                                             #'tabable:' true
                                                             #'model:' #cancel
                                                             #'enableChannel:' #modifiedChannel
-                                                            #'extent:' #(#Point 164 24)
+                                                            #'extent:' #(#Point 166 24)
                                                         )
                                                          #(#ActionButtonSpec
                                                             #'name:' 'acceptButton'
@@ -840,7 +840,7 @@
                                                             #'tabable:' true
                                                             #'model:' #accept
                                                             #'enableChannel:' #modifiedChannel
-                                                            #'extent:' #(#Point 165 24)
+                                                            #'extent:' #(#Point 167 24)
                                                         )
                                                       )
                                                   )
@@ -872,8 +872,6 @@
               )
           )
       )
-
-    "Modified: / 31.10.1997 / 18:35:20 / cg"
 ! !
 
 !UIPainter class methodsFor:'menu specs'!
@@ -898,78 +896,67 @@
            #(
              #(#MenuItem
                 #'label:' 'align left'
+                #'isButton:' true
                 #'value:' #alignSelectionLeft
                 #'activeHelpKey:' #alignSelectionLeft
-                #'labelImage:' 
-                 #(#ResourceRetriever
-                    nil #iconAlignL
-                )
+                #'labelImage:' #(#ResourceRetriever nil #iconAlignL)
             )
              #(#MenuItem
                 #'label:' 'align right'
+                #'isButton:' true
                 #'value:' #alignSelectionRight
                 #'activeHelpKey:' #alignSelectionRight
-                #'labelImage:' 
-                 #(#ResourceRetriever
-                    nil #iconAlignR
-                )
+                #'labelImage:' #(#ResourceRetriever nil #iconAlignR)
             )
              #(#MenuItem
                 #'label:' 'align left & right'
+                #'isButton:' true
                 #'value:' #alignSelectionLeftAndRight
                 #'activeHelpKey:' #alignSelectionLeftAndRight
-                #'labelImage:' 
-                 #(#ResourceRetriever
-                    nil #iconAlignLR
-                )
+                #'labelImage:' #(#ResourceRetriever nil #iconAlignLR)
+            )
+             #(#MenuItem
+                #'label:' '-'
             )
              #(#MenuItem
                 #'label:' 'align top'
+                #'isButton:' true
                 #'value:' #alignSelectionTop
                 #'activeHelpKey:' #alignSelectionTop
-                #'labelImage:' 
-                 #(#ResourceRetriever
-                    nil #iconAlignT
-                )
+                #'labelImage:' #(#ResourceRetriever nil #iconAlignT)
             )
              #(#MenuItem
                 #'label:' 'align bottom'
+                #'isButton:' true
                 #'value:' #alignSelectionBottom
                 #'activeHelpKey:' #alignSelectionBottom
-                #'labelImage:' 
-                 #(#ResourceRetriever
-                    nil #iconAlignB
-                )
+                #'labelImage:' #(#ResourceRetriever nil #iconAlignB)
             )
              #(#MenuItem
                 #'label:' 'align top & bottom'
+                #'isButton:' true
                 #'value:' #alignSelectionTopAndBottom
                 #'activeHelpKey:' #alignSelectionTopAndBottom
-                #'labelImage:' 
-                 #(#ResourceRetriever
-                    nil #iconAlignTB
-                )
+                #'labelImage:' #(#ResourceRetriever nil #iconAlignTB)
+            )
+             #(#MenuItem
+                #'label:' '-'
             )
              #(#MenuItem
                 #'label:' 'align centered horizontal'
+                #'isButton:' true
                 #'value:' #alignSelectionCenterHor
                 #'activeHelpKey:' #alignSelectionCenterHor
-                #'labelImage:' 
-                 #(#ResourceRetriever
-                    nil #iconAlignCenterH
-                )
+                #'labelImage:' #(#ResourceRetriever nil #iconAlignCenterH)
             )
              #(#MenuItem
                 #'label:' 'align centered vertical'
+                #'isButton:' true
                 #'value:' #alignSelectionCenterVer
                 #'activeHelpKey:' #alignSelectionCenterVer
-                #'labelImage:' 
-                 #(#ResourceRetriever
-                    nil #iconAlignCenterV
-                )
+                #'labelImage:' #(#ResourceRetriever nil #iconAlignCenterV)
             )
-          )
-          #( 3 3 )
+          ) nil
           nil
       )
 !
@@ -1248,22 +1235,26 @@
            #(
              #(#MenuItem
                 #'label:' 'stepUp'
+                #'isButton:' true
                 #'value:' #doStepUp
                 #'labelImage:' #(#ResourceRetriever #UIPainter #iconStepUp)
             )
              #(#MenuItem
                 #'label:' 'stepDown'
+                #'isButton:' true
                 #'value:' #doStepDown
                 #'labelImage:' #(#ResourceRetriever #UIPainter #iconStepDown)
             )
              #(#MenuItem
                 #'label:' 'stepIn'
+                #'isButton:' true
                 #'value:' #doStepIn
                 #'enabled:' #canMoveSelectionIntoContainer
                 #'labelImage:' #(#ResourceRetriever #UIPainter #iconStepIn)
             )
              #(#MenuItem
                 #'label:' 'stepOut'
+                #'isButton:' true
                 #'value:' #doStepOut
                 #'enabled:' #canMoveSelectionOutOfContainer
                 #'labelImage:' #(#ResourceRetriever #UIPainter #iconStepOut)