Modified urls and fixed bug