Robbie's tweaks to template