Fix to widget UI