s/macro->formatAddress/macro.formatAddress/
update all staticPageContent calls to twig style
add blocks to popup_layout extended templates