Refactoring Treeview and Navigation classes