Further decoupling, layout changes.