Move layout blocks into partials