Merge "Updating the widget tray" into ub-now-porkchop