add toolbar
more fixes to the toolbar