iOS: More bug fixes with layouts on iPhone 4/4S vs 5.