Fixed form labels and input ids

They now correspond to their content and match their input's id
Merge pull request #27 from Zertz/patch-1

Fixed form labels and input ids