Buggy version of adding to groups

Improved layouting... still sucks balls