Small changes to Widget