CSS refactoring. Clean up.