Updated templates to use div tag instead of p