Better UI component grouping for swath controls (NBE6) [1074]