Changes to address widget