few more changes on the modal forms