more css refactorings