Added: support for multiple toolbars