Merge "lets make the lunch list look a little neater" into cm-10.1

Change-Id: I9dff8062f087828b194001beb3d2e214cfe8e7a2