#388 changed menu and labels