Fixed the order of buttons