Refactoring and UI clean up
Merge branch 'dev' of https://github.com/BYU-NLP-Lab/topicalguide into dev