wip widgets fix