class and id change, sort css
second commit