[Bug 882941] Put all topics in boxes as equals.

And I found a silly copy/paste error. Fixed that too, because it made figuring out what was going on here harder.

r?