more widget fixes