Added wait until settings have saved