More HTML and indentation fixes