Fixing URLs and adding handlebars.