Fixes for message modal and page (highlight)
merging