Improve ButtonSetup