Update index page and working links model
Fix merge conflicts