More refactoring added more views for groups etc