Change menu labels improved