Changes to render HTML properly