Added proper button behaviors
Merge pull request #35 from Particular/Progress

Fixed buttons