fixed issues with messages in the edit template. fixed more issues with the non-partnered deliveries and ending up with blank deliveries - at least put in warning messages.