Improvements to ExpandableTextLayout