merge refactor's NewSessionDialog