For #770, can't we just have a buttonText parameter?