feature form progress
Rectactored FeatureDialog
Rectactored FeatureDialog
Prepare for Chris