Minor UI improvements

Change-Id: I6ac4b603d80e88f2c9b8bad852767056eac1a791