Mostly fixing invalid HTML