Added swatch switching and erasing control