Tweaks to template and Authorize spike