change theme2 layout
fix and refactor page tree and clients management in tree