Final edits to layout