Replaced pre-tags with spans