Polish responsiveness of Groups pg, refactor