Do admin UI changes

Group the settings in admin.