Fixing last commit, didn't include HTML spans necessary