small UI touch-ups

Change-Id: I8daf03e21b5e3186073c0968aea5005b4c62129f