Add view tree
Improve layout and two-pane scrolling