Refactored templates using block.super directive