RAZ-3179: Admin Customization: Re-arrange for better understanding