Fix constructor params error
Refactor dialog component instantiation