Updated to always use iPhone layout