restructured submit form; prevent closure of errors