first big CSS refactorings