Various changes to Widget