[Develop_1] Some refactoring, dialog design