Fixed some issues in edit group