Old Form Reinstall

Put the old, full form back in place. No more fancy 2-part form.