fixed layout of swatches moving, added dynamic button text for better us...

...ability