top changers overhaul

fixes bug 1087290
currently:
![current](https://cloud.githubusercontent.com/assets/21467/4735943/d98e4770-59e6-11e4-8c36-7c18261878d3.png)
after this:
![after](https://cloud.githubusercontent.com/assets/21467/4735947/e8a2e45a-59e6-11e4-9c4e-05dca7b1b317.png)

With the change suggested below, you could then get rid of this bit entirely.