update with groups function and new ui
Merge branch 'devBrian'