Progress on tree based UI

Made some progress on a tree based UI – hope to merge this week:

This PR has been merged.