Move to 2 tiered layout.