Finish styling and tidying up the Sass