css class refactoring
fixed conflicts in stylesheet.css