working on refactoring and css