Add a new custom user button

Cleaned up code
Just added the button; still need to label it and do state restoration