am 55952e2f: Merge "Fixing bugs with new widget adding"

* commit '55952e2f531d7c1ce0a3b2d3131f7ac3d7c1a603':
  Fixing bugs with new widget adding