add more boundaries
finish tree view
remove storage