Fixes for adding multiple users to groups and moved more things inside
the layout