Button states change using temporary tools. code simplification. friendlier variable names
Merge pull request #155 from eVoLuTiVeMEDIA/master

Button states change using temporary tools and code simplification