New onMove layout
Fix delta divergence