More revisions to layout