Some comments and format
Hide popup when click in svg
Prepare to merge 2