Update to no padding, reorder CSS classes on color button