Added more span tags