Layout improvements for iPhone 6 and 6 Plus