Initial css refactoring