Fixed SCSS Issues