Fix a JavaScript bug
Refactoring & URL change