Changes to styling to prevent hierarchy tree overflow.
Merge branch 'release-2.3'