Split the mess of return token into the names for the buttons, and
updated buttons