Various simplifications

Various simplifications and improvements. Fixing a few minor bugs in the job site request form.