CSS refactor