I think the layouts are fine.