Move HALO Settings again, small cleanup

Change-Id: Id1ce5dd203cf65a4ab85dc855063104b7b6367c5