Merge advancedUI with NewGroupsBranch

I need stuff in both of them to continue my work.