Fix highlight tags
Update formatting and image