More form formatting and minor fixes.