Fix to positioning of the toolbar