Added groups page also more functionality