Arrange some features and improve ux

Change-Id: If45e6d1892519a5243687fc63b395cd742033abf