minor UI tweak

Change-Id: I4e9d0db97a97ba199df1717fb4c3a8a1787ffed1
Merge branch 'master', remote-tracking branch 'origin'