Rework of TreeElement and eBook