diff --git a/extra/drills/drills.factor b/extra/drills/drills.factor
index ee4343b1b8..98da12959b 100644
--- a/extra/drills/drills.factor
+++ b/extra/drills/drills.factor
@@ -1,17 +1,18 @@
 USING: accessors arrays cocoa.dialogs combinators continuations
 fry grouping io.encodings.utf8 io.files io.styles kernel math
-math.parser models models.filter models.history namespaces random
+math.parser models models.arrow models.history namespaces random
 sequences splitting ui ui.gadgets.alerts ui.gadgets.book-extras
 ui.gadgets.books ui.gadgets.buttons ui.gadgets.frames
-ui.gadgets.grids ui.gadgets.labels ui.gadgets.tracks ui.gestures ;
+ui.gadgets.grids ui.gadgets.labels ui.gadgets.tracks ui.gestures
+ui.gadgets.corners ;
 
 IN: drills
 SYMBOLS: it startLength ;
 : big ( gadget -- gadget ) { "sans-serif" plain 30 } >>font ;
-: card ( model quot -- button ) <filter> <label-control> big [ next ] <book-btn> ;
+: card ( model quot -- button ) <arrow> <label-control> big [ next ] <book-btn> ;
 : op ( quot str -- gadget ) <label> big swap <book-bevel-btn> ;
 
-: show ( model -- gadget ) dup it set-global [ random ] <filter>
+: show ( model -- gadget ) dup it set-global [ random ] <arrow>
    { [ [ first ] card ]
    [ [ [ second ] [ drop [ "malformed input" throw ] "Malformed Input" alert ] recover ] card ]
    [ '[ |<< [ it get [
@@ -20,8 +21,8 @@ SYMBOLS: it startLength ;
    ] change-model ] with-return ] "Yes" op ]
    [ '[ |<< it get _ model-changed ] "No" op ] } cleave
 2array { 1 0 } <track> swap [ 0.5 track-add ] each
-3array <book*> <frame> { 450 175 } >>pref-dim swap @center grid-add
-it get [ length startLength get swap - number>string "/" startLength get number>string 3append ] <filter> <label-control> @bottom grid-add ;
+3array <book*> 3 3 <frame> { 450 175 } >>pref-dim swap @center grid-add
+it get [ length startLength get swap - number>string "/" startLength get number>string 3append ] <arrow> <label-control> @bottom grid-add ;
 
 : drill ( -- ) [ 
    open-panel [
diff --git a/extra/ui/gadgets/alerts/alerts.factor b/extra/ui/gadgets/alerts/alerts.factor
index 3a4120b3de..04c6b013df 100644
--- a/extra/ui/gadgets/alerts/alerts.factor
+++ b/extra/ui/gadgets/alerts/alerts.factor
@@ -1,4 +1,4 @@
 USING: accessors ui ui.gadgets ui.gadgets.labels ui.gadgets.buttons ui.gadgets.packs locals sequences io.styles ;
 IN: ui.gadgets.alerts
 :: alert ( quot string -- ) <pile> { 10 10 } >>gap 1 >>align string <label> { "sans-serif" plain 18 } >>font { 200 100 } >>pref-dim add-gadget 
-   "okay" [ close-window ] quot append <bevel-button> add-gadget "" open-window ;
\ No newline at end of file
+   "okay" [ close-window ] quot append <border-button> add-gadget "" open-window ;
\ No newline at end of file
diff --git a/extra/ui/gadgets/book-extras/book-extras.factor b/extra/ui/gadgets/book-extras/book-extras.factor
index 31ce8831be..b9d859962f 100644
--- a/extra/ui/gadgets/book-extras/book-extras.factor
+++ b/extra/ui/gadgets/book-extras/book-extras.factor
@@ -6,6 +6,6 @@ IN: ui.gadgets.book-extras
 : prev ( book -- ) model>> [ 1 - ] change-model ;
 : (book-t) ( quot -- quot ) '[ : owner ( gadget -- book ) parent>> dup book? [ owner ] unless ; owner @ ] ;
 : <book-btn> ( label quot -- button ) (book-t) <button> ;
-: <book-bevel-btn> ( label quot -- button ) (book-t) <bevel-button> ;
+: <book-bevel-btn> ( label quot -- button ) (book-t) <border-button> ;
 : >>> ( label -- button ) [ next ] <book-btn> ;
 : <<< ( label -- button ) [ prev ] <book-btn> ;
\ No newline at end of file
diff --git a/extra/ui/utils/utils.factor b/extra/ui/utils/utils.factor
index 468af45150..0880139865 100644
--- a/extra/ui/utils/utils.factor
+++ b/extra/ui/utils/utils.factor
@@ -1,6 +1,6 @@
-USING: accessors sequences namespaces ui.render opengl fry ;
+USING: accessors sequences namespaces ui.render opengl fry kernel ;
 IN: ui.utils
 SYMBOLS: width height ;
 : store-dim ( gadget -- ) dim>> [ first width set ] [ second height set ] bi ;
-: with-dim ( gadget quot -- ) '[ _ store-dim @ ] with-scope ;
-: with-w/h ( gadget quot -- ) '[ origin get _ with-translation ] with-dim ;
\ No newline at end of file
+: with-dim ( gadget quot -- ) '[ _ store-dim @ ] with-scope ; inline
+: with-w/h ( gadget quot -- ) '[ origin get _ with-translation ] with-dim ; inline
\ No newline at end of file