Updated the button setup to work with the same orering of params as other functions.

TODO: fix multi button set up