Minor UI changes

Change-Id: I19cbc090c0c82fc48163c7cddb14734f60988d64