Fixed ModuleDataSource issues with Toolbar (Toolbar is now centralized in DynamicEntity)