add animation logic
tweeked interest view
resolve merge conflict