Fix some form rendering issues and update to show them