refactoring layout and css files