IDEX-1034 change styles and field names
Merge branch 'IDEX-1034'