minor bugfix and replacement of SpacetreeLayout with TreeLayout