UI changes according Nathan email

Change-Id: I8cb1e31c45daaaec88582e3d515887c0027103ed