Addendum to #449 - fix also the edit buttons in the model and content elements.