Unmixup topic and post show

Go ahead and look over the changes, then merge this pull request and pull down the changes locally:

```bash
git pull origin master
```