Updated template includes for new design