Fixed duplicate widgets bug