Reordered some of the buttons