CSS & HTML naming and spacing cleanup