adding styles and refactoring