 	scn (draw-on-scene (layout-function lattice)),
 	canvas (.. scn getWindow getCanvas),
 
-	buttons (JPanel.),
+	#^JPanel canvas-panel (JPanel. (BorderLayout.)),
+	hscrollbar (JScrollBar. JScrollBar/HORIZONTAL),
+	vscrollbar (JScrollBar. JScrollBar/VERTICAL),
+
+	#^JPanel buttons (JPanel.),
 	box-layout (BoxLayout. buttons BoxLayout/Y_AXIS)]
     (.setLayout buttons box-layout)
     (.setPreferredSize buttons (Dimension. 110 0))

	[clojure.contrib.swing-utils :only (do-swing)])
  (:import [javax.swing JFrame JPanel JButton JTextField JLabel
	                JOptionPane JSeparator SwingConstants
	                BoxLayout Box]
	   [java.awt Canvas Color Dimension BorderLayout GridLayout Component Graphics]
	   [java.awt.event ActionListener]))


      change-parameters
      improve-layout-by-force
      export-as-file)
    (doto canvas-panel
      (.add canvas BorderLayout/CENTER)
      (.add hscrollbar BorderLayout/SOUTH)
      (.add vscrollbar BorderLayout/EAST))
    (.installScrollHandler scn hscrollbar vscrollbar)
    (doto main-panel
      (.add canvas-panel BorderLayout/CENTER)
      (.add buttons BorderLayout/WEST))
    main-panel))

