Add span tags around form question