Added Checkbox to enable/disable each feature

MAJOR CLEAN UP !