Laying out

I’ve finished the 20 octagons and 12 squares needed for this blanket so decided to lay them out on the bed to see how it looked. Trying to make sure no row or line contains same colours ( outside row). I’ve got 14 triangles to make to fill in the edge, then will join it with black and the border will be mainly black. These are the colours for my son’s gf, I’ve enjoyed making it. The weather today is horrid, so not going out.
I managed to ( at last but rightly so that the more needy were priority) get a delivery slot for later from a supermarket, huzzah, so really not going out! Later we are doing a zoom cheese and Winetasting with decentdrop.