Rework custom field roles ui and fix field roles edit.