Replaced page construct with page break
Adapt model to upper changes
Bugfixing and Refactoring