Fix header layout for iOS, add 3 new cases