Dialog send & refactor