core-4371 core-4372 rearrange menu items