I think these need to be changed to `%span.list-item-name`. Otherwise these are divs, which cause the labels and buttons to be shown on the next line.

I just upgraded to 6.8 and now everywhere this new class is used, look like this:
![screen shot 2014-04-25 at 10 05 54 am](https://cloud.githubusercontent.com/assets/2117996/2802118/b7f2ffb4-cc8a-11e3-86fc-df640d662ab1.png)