Modify better window movement