Changes to button methods

Separated button being on from outputs.  Various other changes.