Major refactor "AbstractBasisDialog"