More Refactoring
UI work
Added enable/disable option