REFACTOR: Fixes poor class hierarchy for listing topics