some refactoring
Add css