diff --git a/library/cocoa/ui.factor b/library/cocoa/ui.factor
index 87a437ed38..1653eb0a4a 100644
--- a/library/cocoa/ui.factor
+++ b/library/cocoa/ui.factor
@@ -33,7 +33,7 @@ H{ } clone views set-global
     r> [frame] NSRect-h swap - 0 3array ;
 
 : send-mouse-moved ( view event -- )
-    swap [ mouse-location ] keep view move-hand ;
+    over >r mouse-location r> view move-hand ;
 
 : button ( event -- n )
     #! Cocoa -> Factor UI button mapping
diff --git a/library/ui/hand.factor b/library/ui/hand.factor
index 9edaf34fd5..bf0381c09c 100644
--- a/library/ui/hand.factor
+++ b/library/ui/hand.factor
@@ -84,7 +84,7 @@ C: hand ( -- hand )
 
 : show-message ( string/f -- )
     #! Show a message in the status bar.
-    world-status set-label-text* ;
+    world-status [ set-label-text* ] [ drop ] if* ;
 
 : update-help ( -- string )
     #! Update mouse-over help message.
diff --git a/library/ui/launchpad.factor b/library/ui/launchpad.factor
index 18385793d3..923d985878 100644
--- a/library/ui/launchpad.factor
+++ b/library/ui/launchpad.factor
@@ -13,8 +13,5 @@ gadgets-listener io kernel memory namespaces sequences ;
         { "Exit" [ 0 exit ] }
     } <launchpad> ;
 
-: simple-window ( gadget title -- )
-    >r "" <label> over pref-dim r> in-window ;
-
 : launchpad-window ( -- )
     default-launchpad "Factor" simple-window ;
diff --git a/library/ui/listener.factor b/library/ui/listener.factor
index 7dac647474..c6cb32c5cf 100644
--- a/library/ui/listener.factor
+++ b/library/ui/listener.factor
@@ -9,17 +9,12 @@ namespaces parser prettyprint sequences shells threads words
 help ;
 
 SYMBOL: stack-bar
-SYMBOL: browser-pane
-
-: reveal-in-split ( gadget n -- )
-    >r find-splitter dup splitter-split r> - abs 1/16 <
-    [ 1/3 over set-splitter-split dup relayout ] when drop ;
 
 : in-browser ( quot -- )
-    browser-pane get dup 0 reveal-in-split swap with-pane ; inline
+    make-pane <scroller> "Browser" simple-window ; inline
 
 : in-listener ( quot -- )
-    pane get dup 1 reveal-in-split pane-call ; inline
+    pane get pane-call ; inline
 
 : usable-words ( -- words )
     use get hash-concat hash-values ;
@@ -60,16 +55,13 @@ SYMBOL: browser-pane
         2array make-pile 1 over set-pack-fill
     ] keep ;
 
-: <browser-scroller> ( -- gadget )
-    <pane> dup browser-pane set-global <scroller> ;
-
-: <listener-scroller> ( -- gadget )
+: <scroller> ( -- gadget )
     <input-pane> dup pane set-global <scroller> ;
 
 : <listener> ( -- gadget status )
     <frame> dup solid-interior
-    <browser-scroller> <listener-scroller>
-    0 <x-splitter> over @center frame-add
+    <input-pane> dup pane set-global <scroller>
+    over @center frame-add
     <bottom-bar> >r over @bottom frame-add r> ;
 
 : listener-window ( -- )
diff --git a/library/ui/world.factor b/library/ui/world.factor
index 11929854ad..6fdf092523 100644
--- a/library/ui/world.factor
+++ b/library/ui/world.factor
@@ -50,3 +50,6 @@ M: world find-world ;
 
 : focused-ancestors ( world -- seq )
     world-focus parents reverse-slice ;
+
+: simple-window ( gadget title -- )
+    >r f over pref-dim r> in-window ;