Updates to CSS specificity

Removing the need for grouped classes where a modifier is clearly used.