Issue 133

This isn't perfect but it's probably a good place for a first merge on the edit page. 

Let me know if you don't want to merge and I'll change whatever I need to.