Some cleanup of the page layouts