Continued refactoring css to scss