Added better naming to groups views