Merge "Revert "Tweak Modes layouts and use updated strings to match mocks"" into main