Changed order of buttons