Improve wording of toolbar.

Make low width version of toolbar also show on somewhat larger screens.
This helps accomodate slightly longer messages.

Change-Id: I0c3e1663abae7ca5f02ab63713864ef6218d8fac