Simplifying HTML, fixing links