Added span tags