Change the buttons to span