Fix validation errors

Conflicts:
	_layouts/default.html