more scss refactoring