Fixing it to work better with angular.
Fixing a few more problems with the new classes.