Jbau file edit dialog

@jrbl  I think you're likely the best person to look at this.  

There were some bug fixes in the ContentGroup model as well.