More compact suggestion rows

Change-Id: Ie0f6900554963fd3b557689ba2d6f0ce2022be37