Updated UI to latest