Comment 4 for bug 844097

I'm marking this as fixed to get it off my tracker until Design says there's something wrong with what we have today. (I believe we are in line with mockup intent, though the mockup is out of date.)