Replaced label-tag with span-tag when not dealing with input-elements