Fix obvious misuses of labels

These changes are untested. I've just used this form, and was frustrated that it had <label>s, but that they were not attached too their relevant <input>s. This patch should fix that.