button fix and new swatch