Updated UI: Buttons instead of Dropdown