Fixes to the markup of the toolbar