Diabetes fix - fix field arrangement