better layout of swatches