More HTML tidying