Added colour swatches, rearranged header layout.