[TASK] Some fine-tuning for tree view