Rearrange to remove the need for !important