Move popup along with text annotation
Include some popup checks