Updated template for layout