           e-ctx   @ectx,
           widget  (context-editor-widget. (get-widget root) table toolbar ectx),
           keystroke-fill  (KeyStroke/getKeyStroke KeyEvent/VK_SPACE
-                                                ActionEvent/CTRL_MASK false),
-          add-button- (fn [toolbar text f & args]
-                        (add-button toolbar
-                                    (doto (make-tooltip-button "no-tip" text)
-                                      (set-handler #(set-context @ectx (f widget))))))
-
-          add-separator (fn [toolbar]
-                          (add-button toolbar (Box/createVerticalStrut 3)))
-          
+                                                  ActionEvent/CTRL_MASK false),
+
           add-button-box (fn [toolbar & buttonlist]
                            (let [box (Box/createHorizontalBox)]
                              (doseq [button buttonlist]
                                (if (contains? button :spacer)
                                  (.add box (Box/createHorizontalStrut (:spacer button)))
-                                 (let [ bctrl (make-tooltip-button (:tip button) (:name button))
-                                        handler #(do
-                                                   (if (contains? button :no-return)
-                                                     ((:no-return button) widget))
-                                                   (if (contains? button :f)
-                                                     (set-context @ectx ((:f button) widget))))]
+                                 (let [bctrl (make-tooltip-button (:tip button) (:name button))
+                                       handler #(do
+                                                  (if (contains? button :no-return)
+                                                    ((:no-return button) widget))
+                                                  (if (contains? button :f)
+                                                    (set-context @ectx ((:f button) widget))))]
                                    (set-handler bctrl handler)
                                    ;;(add-button toolbar bctrl)))
                                    (.add box ^JComponent (get-widget bctrl)))))

                         :f (cc-1 clarify-context)}
                        {:spacer 3}
                        {:name (get-image-icon-or-string "context-editor/reduce-attribute.png"
                                "rA"),
                         :tip "Reduce the attribute columns of the context",
                         :f (cc-1 reduce-attributes)}
                        {:name (get-image-icon-or-string "context-editor/reduce-object.png" "rO"),

                         :tip "Remove all selected rows and columns from the context",
                         :f cut-objects-attributes})
        (add-button-box {:name (get-image-icon-or-string "context-editor/clarify-attribute.png"
                                                         "cA"),
                         :tip "Clarify the attribute columns of the context",
                         :f (cc-1 clarify-attributes)}
                        {:name (get-image-icon-or-string "context-editor/clarify-object.png" "cO"),
