rework the layout for the toolbar.