Image widget fixes