Updated template for new layout