Fix bug of tracking only the top-most widget, #191
Apply the same fix to addition of widgets
Merge pull request #192 from x-team/issue-191

Track addition/deletion of all widgets, not only the top most ones