merged wrong branch?
fubared layout
Added collapsing tree to screen