Rearranged padding and margin so that more specific classes are later;