Add group list page and refactor lot of stuff