#5104: UI for adding groups + scene works normal.

+ some code improvements
+ following bugfixes for branch 5081_groups