Improvments in notebooks and basic document back-end done.
Conflicts