Sass refactoring and style updates