refactored tag popup
Merge branch 'ray'