Condense input forms

[jeff-r]

The forms are currently spread out enough that it's hard to keep track of what's on each page.