Fatal Errors on Twig Layouts

I took the liberty to temporarily fix that nasty template error that the master branch was causing.