Some refactoring in dialog holders
Some refactoring in holders
Some refactoring in holders