Quick accessibility win

Hi. I made a few changes to improve the markup:

- removed duplicated id
- made sure each form field has a label associated with it