improved rendering
TODO: fix sibling rendering