Added Angular. Touched up templates.