various widget fixes