General tidyups to the scss files