misc: correcting the form (part 2)

There's still a bunch of things to do here. This is far from finished.
Most of the form is fine, But still it lacks tons of indents.

-*S