Sass refactor

Check and make sure things aren't broken before you merge this