Changed: menu sorting to prevent weird behaviours