Fixing a bug with it not detecting group toolbars properly and experimenting with multiple toolbars