No more ng-classify, much needed updates