Minor changes to widgets / user samples