Change the way templates render for being able to override - header is broken