Fixing widge bugs