HTML preview rendering
General additions / modifications