Updated Template better use of content blocks