--- a/UIPainter.st	Tue Jul 13 20:51:52 1999 +0200
+++ b/UIPainter.st	Tue Jul 13 21:04:49 1999 +0200
@@ -2433,7 +2433,7 @@
 raiseUIView:aView
     "raise the view which is an application or top view"
 
-    aView map.
+    aView remap.
     aView bePartner.
 !
 
@@ -2795,7 +2795,7 @@
 openInterface:aSymbol
     "opens the interface on the selector aSymbol"
 
-    |cls painterView painter topView|
+    |cls painterView painter topView galleryWindow|
 
     modified := false.
 
@@ -2849,7 +2849,7 @@
 
     selectionPanel := UISelectionPanel new.
     selectionPanel allButOpenInterface:#windowSpec.
-    selectionPanel window openInGroup:(topView windowGroup).
+    (galleryWindow := selectionPanel window) openInGroup:(topView windowGroup).
     selectionPanel openWindow.
     selectionPanel masterApplication:self.
 
@@ -2861,10 +2861,10 @@
 
     topView bePartner.
     painterView bePartner.
-    selectionPanel window bePartner.
-
-    selectionPanel window iconLabel:'GUI Gallery'.
-    selectionPanel window icon:(Image fromFile:'bitmaps/UIPainter.xbm' resolution:100).
+    galleryWindow bePartner.
+
+    galleryWindow iconLabel:'GUI Gallery'.
+    galleryWindow icon:(Image fromFile:'bitmaps/UIPainter.xbm' resolution:100).
 
     painterView topView raise.
 
@@ -2950,17 +2950,18 @@
     myOrg := myWindow origin.
     myCorner := myWindow corner.
 
-    myCorner x + canvasWindow width <= device width ifTrue:[
-        canvasOrg := (myCorner x + canvasWindow width) @ myOrg y.
+    (myCorner x + canvasWindow width + 20) <= device width ifTrue:[
+        canvasOrg := (myCorner x + canvasWindow width) @ (myOrg y).
     ] ifFalse:[
         canvasOrg := 0@0.
         myOrg := (device width - myWindow width - 20) @ 0.
         myWindow origin:myOrg.
     ].
 
+    canvasWindow origin:canvasOrg.
+
     galleryWindow raise.
     canvasWindow raise.
-    canvasWindow origin:canvasOrg.
 
     galleryWindow 
         origin:((myOrg corner:myCorner) topCenter x - (galleryWindow width // 2)) rounded