Cleanup overflow ui

Change-Id: I619ccb1194db0d4a1e53c4fe7d2a934bda5d70a4