preliminary v2 layout