Fix inconsistency in custom fields position
Merge pull request #1296 from gilfu/develop

Fix inconsistency in custom fields position