Layouts tweaked for deployment.