Replaced Group Add and Search Modal