working create/edit linked entities in dashboard + refactoring