Menu composition and relevant updates