Nitpickity addressed: Added span classes.