Refactoring More CSS