Changes to SCSS formatting and Jason's code