Added "for" attributes to labels.
Clearing merge conflicts