new version
CSS clean up