API merge challenge

This includes 4 changes to /js files, 1 change to /css file, and 21 of the 26 files in /templates