Also change buttons to use new function

Forgot to commit this in previous commit.