switch buttons better