#36 Clean up HTML and links