Always show the toolbar
Move some buttons to the toolbar