Basic Main-View changes
- replaced list by a tree