YH-177: Broaden scope of user menu