refactored and tidied up grouping game view