Move relocate mouse focus

Targets #421 
Is this necessary?