More iOS 6 layout fixes