Add the ability to toggle popover-link-component by clicking multiple times
iwip modal popup
Fix corner cases