Some fixes on index page