General bug editing and new templates

NewUSOpportunity
InboundNotificationReply