#259 changing messages on order xray and merge to be toast messages