Merged floor and wall layers for efficiency on VF