Updated TreeFactory tree generation.
Refactored node highlighting some.