Make more use of SCSS nesting