Merge "Fix missing mode title and menu" into main