lets make the lunch list look a little neater

It's very simple, but with more and more devices coming in, a long list won't cut it
There are probably better ways of doing this, feel free to comment

Change-Id: I9bd1fef920f985a133c882df9987b6be29dbc7b8
Merge remote-tracking branch 'upstream/jb2' into jb2