Fixing main index page problems