Nodes are now rearranged to avoid splits
New layout is now working fine
Improving performance (wip)