fix minor bugs
fix toolbars on mac