Bugfixing toolbars