Have the labels actually work as labels.

HTML labels are only meaningful if they either contain or
point to the field they're the label for.

Change-Id: I6b8b85f572b61cc69c37be9a15887e0f7e74889b