Use new widget managers
Improve CreateMatrixDialog
Closes #489