refactoring
refactored to display Tree on main screen + revisited tests