     (.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))
 
 

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

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

(defn- make-padding

	#^JPanel buttons (JPanel.),
	box-layout (BoxLayout. buttons BoxLayout/Y_AXIS)]
    (.setLayout buttons box-layout)
    (.setPreferredSize buttons (Dimension. *toolbar-width* 600))
    (install-changers frame scn buttons
      toggle-zoom-move
      change-parameters
