Update for request modal usability. Pull the scan and pickup fields out of the label, since having it inside is causing problems in Chrome :barber:
Merge remote-tracking branch 'origin/master' into qa