Added ng-animate, updated controllers