#13 - Improved modularity of collaborative-edit-view