Improved a couple of Sass stuff