Move generic, overriding margin & helper classes in to own partial