TODO: Widget issue resolved.