Added scroll to popup
Separated links from attributes