Small changes to style.scss ordering