Html validity fixes