* fixed animation bug on scrolling, ~ refactoring