Work-in-progress: Restructure master and detail view controllers to allow easier access to all entities and not just Components