Some DRY changes to SCSS/CSS