Improve identify popup window
Merge branch 'develop'