Fix translation of 2d viewer
Fix motion handler glitch & little renaming for clarity