widgets: common: sanitazed and cleaned-up little bit