widgets: common: finished small refactoring