Refactored most of the base SCSS