#36 #42 Fix endless scrolling and add animation resource