UI cleanup

Change-Id: Iaf138455651511e610b640a716820bd846284948
8 files changed