add expand to tree
add remarks

TODO: the layout should be set