Fix inconsistency in custom fields position