Unmixup topic and post show
Resolve magination merge conflict
Resolve magination merge conflict
Merge pull request #1 from bmneely/fix-topic-and-post-show

Unmixup topic and post show