Simplify CommandMapButton code.
Add main toolbar to command map. Zooming combo box disabled (for now).