Fix modal form

Fix modal form