Added shuffle feature
some changes in animation