Dynamic Tree View
Minor bug fixes and cleanups