Cleaning up CSS naming.  Switching to spans