urls changes and fixed