Some more in depth CSS refactoring