[Button setup] Some cosmetic changes.