Clean up HTML formatting a bit
Clean-up validator errors