SCSS refactoring fixes