Merge pull request #29 from zestos/master

Add button changes (not persistent yet)
Not quite