refs #16: Moved around form inputs.