edit messages
Merge pull request #710 from YaleSTC/706_update_popup

edit messages