Merge "Add ids to modes views" into main