SASS and fixes