more buttons, and better text