Consolidated/nested some of the selectors in site.less