Widget improvement