groups + group view refactoring