Fix the WidgetList