fix:
* Horizontal scroll (due to the long entity names) should not include the toolbar.
* When a tree is collapsed, and we check one of the previously excluded options, currently the tree is made to expand. I think it should stay collapsed.
https://issues.apache.org/jira/browse/CAY-1841