Start process of incorporating reusable cross-component layouts.
Fix location of info block issues.