Remove usage of raw() view helper in layout