Added groups selector page, and added persistant group selection