Updated template layouts for new design