Updated button names and removed conditionals
Merge pull request #3 from zenduo/develop

Updated button names and removed conditionals