Change back to Sass
WIP: Refactoring markup, correcting new styles