global constants added
testing new way to get popup row
popup refactor