Clean up groups view

See about moving this backwards