Add layout to agreements, and extract some partials
Solve merge conflict