Reordered input fields

also a couple of minor label changes