[2.3] Refactored DI, no widget is added by default

WIP