Restructure markup to simplify data bindings.
Upgraded to Angular 1.3, JQuery 2.1.1.