Fix layout bug with newer iOS versions