Improved Disabling, prevent double-click