Add layout name to content block headings.
Add wrappers to each content block section.
Make margins for item selection form more consistent.
Adjust margins and add borders to content block sections.