Add locking to relocator controllers and fix rendering.