Moved the pin connections for the buttons around to better accommodate routing.