Major adjustments for controls, feature class, etc