general CSS refactoring