ButtonUI: Updating button logic

Still slightly buggy
Merge branch 'master' of https://github.com/greglo/StackGame