Improve content height initial and subsequent sizing