Fix: Mis-aligned delivery options with error messages