CSS clean up and linking