Improved colour swatches, added extended nav IF statement