Fixed issues with dragging and widgets