Rebuild on watch
Normalize edge positioning