HTML & CSS clean up