Pagination / Templating Fixes

Closes #65
Closes #64