UI changes based on feedback from Jeff and Amar.

Bug: 2278206
13 files changed