-some refactoring  changes to modalCheckbox/prettyCheckbox
-halfway though filtering the _featureEnabled for save