Support text on buttons depending on type
Merge branch 'better-buttons'