moving the css and refactoring