equal-height-child + minor changes