More HTML changes, commit revert
merge
message