Change some tags and formatting