Sass Improvements