Layout and partials
merge