Web: refactored/simpler tree. Small correction