Fixed editContent to work with new structure

We should be ready to merge structure with
master. OOh Rah!