Fix widget class
widgets refactoring