General Bug Fixes
Merge pull request #6 from elbongurk/fix-buttons

General Bug Fixes