Reworked template using blade