Get rid of buttons
Add spinner
Add spinner for real