Fixing widget bugs
Fixing widget bugs