Some css refactoring