Sass/Css improvements