clean code on group selection page, fix closing of edit page
Merge branch 'master' of github.com:Zazcallabah/id2216