[Button setup] Several tweaks.