Removing labels and adding classes to make elements targetable