updated Widgets functionality, but still not done
updated FIx Widgets functionality, but still not done