Refactored SCSS/CSS to be more modular