Various UI improvements

Change-Id: Ifa47115b0f18e62c4179a4e8306cc14ca0b7ea05