Fix template incompatibility with Magento 2.3

Fixed

• Reverted changes made to templates to use new content escaper back to using the Block class for escaping to ensure that extension remains compatible with Magento 2.3