Tweaks to template and pulling game out