refactoring valueWidgets
refactoring valueWidgets #2
merging development