[FEATURE] Fix losted comas and form

Some elements of the modal window has been changed.