Style updates to use Sass more effectively