Add css styles and some refactoring