display labels on form fields

Form field labels were no longer receiving the 'for=""' attribute. This branch makes it work again.

There probably is a cleaner way for the regex to work as well.