widget fixes