css style and refactoring