More iPad optimizations

See title