CSS & HTML fixes