Back to the tree layout, improve text labels, focus element onClick.