refactored tree view items so that we only need 2 data templates.
reorganized