Fixing widget bugs