Fixed issues with Toolbars.