Minor widget modle changes