modal form fixes