Added animations to browse view
Fixed merge conflict