Tweaked the UI and the Functionality with an Activation Setting