mbs-6524: standardise type/language display and editing order
Merge remote-tracking branch 'reosarevok/mbs-6524' into beta