Fixed animation issue and scale issue