CMS-2024 Toolbar: Adding elements after greedy spaceer does not work pro...

...perly

Fixed order in Toolbar. Some refactoring in Tollbar class