refactor - separate app/dialogs