UI tweaks and code cleanup
Updated TreeUtils