changed order of buttons