server.js and template updates