changed form in modal.php
Merge origin/master