Grouped and reordered fields. Expanded the length of some selects.