Add optgroup and margin