Update to latest UI code