More work on layout.

Mostly works but Test_ScrollViewer_With_TextBlock is failing again.