finished moving the rest of the buttons around