CSS clean up and fix