ticket:6 Fix widget