fixed Widgets, added ANDs