tree: refactored views