HTML tidying
Merge