This also refactors the layout to accommodate longer text Bug: 16364316 Change-Id: I41eacba5b09a4f13af9695594c1a53eae075554f