Improved form labels to be clickable