Added group controller, fixed routes