Added hack to solve the problem of incorrect Widget shape.

See code for details.