Fix order of buttons