finish css
refactoring