Add correct urls
Fix paddings