Fixed latest features

widget-tool is kind of stable now