refactoring of parameter widget
Merge remote branch