Finished prefs check box (Could probably use more testing)
Merge branch 'PrefEnableButton'

* PrefEnableButton:
  Finished prefs check box (Could probably use more testing)