Quick button updates
Merge pull request #11 from tganyan/button-touchup

Quick button updates