little refactoring in the code (WIP)
WIP: missing fixing functional tests
now looking for widgets working even in the functional tests