refactor & modify the add group form