refactored css-classes a bit