Refactor templates
Updated the book source
Updated HTML