Revert "DRY"

This reverts commit bbd5d760a5e4ece95ff5371a2ceed96d468baa33.
Revert "Generate pages without layout to ease iframe integration"

This reverts commit e8b11c95a5f6aea41e41de4ec6419e58ea7d971a.