Fix arrow offset of fields on the right