Fix button active states
Merge branch 'master' of github.com:dosjos/Startup