Moved the buttons around so that they make more sense.