Template adjustments

Also, include AngularJS