More HTML and markdown clean up