b/5081643 Fix issues with fields incorrectly displayed

On phone guests wasn't showing up correctly and an extra separator
was being shown. There's still more visual tweaks to be done for
this bug.

Change-Id: I70c6fa1a043c0126ddc962814a2b885718e54cfd