Switch button usage per #231
Merge pull request #245 from trainman419/clear_topics

Switch button usage per #231