Move layout elements into partials