Move battery settings to correct place