simplify UI

Change-Id: Icde7e2440481c59634a884d123aa4c380216e44f