Merged timeline and tree view together
changed