Some fixups of the layout page.