UI Improvements
am: 1ebb52cc97

Change-Id: If971e42d676b092d82f24659a55305680340668b