+ reinstated long button labels