fixing span tags and rebuilding