Merge pull request #39 from seavor/jay

lay out edit item flow