Move and fix some Settings

Change-Id: I2532bd1de764b575a3e74b00ccc74ef774dc5fec