Fixed animation move units and refactoring