fix fresh/dusty button states
Merge branch 'master' of github.com:ngokevin/ngokevin