Apply minor tweaks to template