fix the removal of header in the popup, fix the message being use in add variable successful

Reviewer: Tiff Go

Issue: none