Fixed issue with toolbars.