Refactored css to sass: take 2