Fix form rendering