Done on revisions to layout