Cleaning up poorly done &nbsp; and switching it with a <span> tag.
Merge remote-tracking branch 'origin/master'