Instead of putting pawns in their own layout, add them as children of whatever they are in.