Patch Set 1:

Steffen, I think the patch goes into the right direction but I don't see why the layout code is in the checkPage() method in the first place. I would expect that the layout is done exactly once, or do you see a scenario where it happens more than once?