Image widget logic fixes