Build & dialog refactoring
.