SCSS improvements