diff --git a/saturn/Makefile b/saturn/Makefile
index 852d14e..a2df6cc 100644
--- a/saturn/Makefile
+++ b/saturn/Makefile
@@ -7,7 +7,7 @@ MODULES=main.fnl
 	lua $(FENNEL) --compile $< > $@
 
 saturn: $(patsubst %.fnl,%.lua,$(MODULES)) Makefile
-	(echo -e "#!/usr/bin/lua\n" ; cat main.lua ) > $@
+	(echo -e "#!/usr/bin/env lua\n" ; cat main.lua ) > $@
 	chmod +x $@
 
 install:
diff --git a/saturn/main.fnl b/saturn/main.fnl
index 14765ee..fe8650f 100644
--- a/saturn/main.fnl
+++ b/saturn/main.fnl
@@ -133,17 +133,13 @@
 
 (local grid-columns 4)
 
-(let [grid (Gtk.Grid {
+(let [grid (Gtk.FlowBox {
                       :column_spacing 2
                       :row_spacing 5
                       })
       scrolled-window (Gtk.ScrolledWindow {})]
-  (var i 0)
   (each [_ app (pairs (all-apps))]
-    (let [x (%  i grid-columns)
-          y (// i grid-columns)]
-      (set i (+ i 1))
-      (grid:attach (button-for app) x y 1 1)))
+      (grid:insert (button-for app) -1))
   (scrolled-window:add grid)
   (window:add scrolled-window))