Some minor form rendering tweaks