Merge "Fixing bugs with new widget adding"