Move Oct settings into System section and will be adding Advanced to Oct Settings.