Back to the tree layout

#53