Form options style tweaks

Not quite finished, but I'm committing this now so I can go back and do some tidying up and tabify stuff and basically get everything in order.