CSS refactors