refactored css
merge for changes