[QuickButton] Tweaks