Comment 6 for bug 328235

I've merged jmonreal's branch into trunk. I suspect we will always manage to produce slightly confusing results because of the way the widgets are nested, but if there is still a problem after the merge, please feel free to re-open this bug for further investigation.