Fixed broken disabled buttons
Merge pull request #96 from goehle/upgraded2.7

Fixed broken disabled buttons