[Button setup] Some tweaks.