More descriptive button states per discussion in ed7e2cf

@Technical-13, please try this out and let me know your thoughts.