Refactor Groups views