Added group CRUD and more user tweaks