one more button in viz, cleanup code