HOVER: Arrange Settings

Change-Id: I8717a75fc4f44e0def5dd264d4f72d0fcfcd98c0