     (.installScrollHandler scn hscrollbar vscrollbar)
     (doto main-panel
       (.add canvas-panel BorderLayout/CENTER)
-      (.add buttons BorderLayout/WEST))
+      (.add (JScrollPane. buttons JScrollPane/VERTICAL_SCROLLBAR_ALWAYS
+			          JScrollPane/HORIZONTAL_SCROLLBAR_NEVER)
+	    BorderLayout/WEST))
     main-panel))
 
 

(defn- export-as-file
  "Installs a file exporter."
  [frame scn buttons]
  (let [#^JButton gif-exporter (make-button buttons "to GIF"),
	#^JButton png-exporter (make-button buttons "to PNG"),
	#^JButton jpg-exporter (make-button buttons "to JPG")]
    ;; TODO: add handlers to save to file
    nil))

;; safe changes

(defn- snapshot-saver
  "Installs a snapshot safer, which, whenever a node has been moved,
  saves the image."
  [frame scn buttons]
  (let [saved-layouts (atom {}),

(defvar- *item-height* 25
  "Heights of items on toolbar.")

(defvar- *toolbar-width* (+ 20 *item-width*)
  "Width of toolbar containing buttons, labels and so on.")

(defn- make-padding
