Added widgetId property to PageWidget