degree2+ cleaning, enum fix, comment fix, beginning of range field

Consolidated 2+ degree fields to one xaml, comment show/hide enabled,
enum index toggle without invisible button done