Expand and ellipsis improvements