[Button setup] Tweak button and deleted zap-hack.